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

[ATM]: Ignore generated file pca200e_ecd.bin2

2006-12-11 14:34:35 -08:00

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

firmware: convert Ambassador ATM driver to request_firmware()

2008-07-10 14:49:39 +01:00

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

drivers/atm/eni.h: remove unused macro KERNEL_OFFSET

2008-06-10 12:46:52 -07:00

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

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

fore200e.c

of: Remove duplicate fields from of_platform_driver

2010-05-22 00:10:40 -06:00

fore200e.h

fore200e: Convert over to pure OF driver.

2008-08-29 02:14:59 -07:00

he.c

drivers: net: use skb_headlen()

2010-04-14 16:11:33 -07:00

he.h

atm: [he] remove #ifdef clutter

2008-06-17 16:21:44 -07:00

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

long vs. unsigned long - low-hanging fruits in drivers

2007-10-14 12:41:51 -07:00

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

[ATM]: [idt77105] should be __devinit not __init

2006-06-29 16:58:12 -07:00

idt77252_tables.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

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

iphase: Fix 64bit warning.

2008-05-14 23:28:47 -07:00

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

atm: Driver for Solos PCI ADSL2+ card.

2008-12-26 01:26:11 -08:00

midway.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

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

atm nicstar: Removal of debug code containing deprecated calls to cli()/sti()

2008-04-19 18:10:46 -07:00

nicstarmac.c

[ATM]: [nicstar] Replace C code with call to ARRAY_SIZE() macro.

2007-07-18 01:46:53 -07:00

nicstarmac.copyright

drivers/atm/: remove CVS keywords

2008-05-20 14:52:25 -07:00

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

atm: [suni] add support for setting loopback and framing modes

2008-06-17 16:19:24 -07:00

tonga.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

uPD98401.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

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

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

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

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

zeprom.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00