Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
.gitignore
adummy.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ambassador.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ambassador.h
atmtcp.c	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
eni.c	drivers: net: use skb_headlen()	2010-04-14 16:11:33 -07:00
eni.h
firestream.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
firestream.h
fore200e.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
fore200e.h
he.c	drivers: net: use skb_headlen()	2010-04-14 16:11:33 -07:00
he.h
horizon.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
horizon.h
idt77105.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
idt77105.h
idt77252_tables.h
idt77252.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
idt77252.h	atm: idt77252: Use generic SKB queue management instead of home-grown scheme.	2008-09-21 21:38:26 -07:00
iphase.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
iphase.h
Kconfig	atm: select FW_LOADER in Kconfig for solos-pci	2010-05-17 17:44:36 -07:00
lanai.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Makefile
midway.h
nicstar.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
nicstar.h
nicstarmac.c
nicstarmac.copyright
solos-attrlist.c	solos: Show Interleaving details for ADSL2 and 2+	2009-05-07 19:49:44 +01:00
solos-pci.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
suni.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
suni.h
tonga.h
uPD98401.h
uPD98402.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
uPD98402.h
zatm.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
zatm.h
zeprom.h