Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd91ac2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 6e2324e0 38c0b2c2

arch/ia64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ show_cpuinfo (struct seq_file *m, void *v) 
	char family[32], features[128], *cp, sep;

	struct cpuinfo_ia64 *c = v;

	unsigned long mask;

	unsigned int proc_freq;

	unsigned long proc_freq;

	int i;



	mask = c->features;

arch/ia64/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ int ia64_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size) 
 */

int ia64_pci_legacy_write(struct pci_dev *bus, u16 port, u32 val, u8 size)

{

	int ret = 0;

	int ret = size;



	switch (size) {

	case 1: