Grant Likely 4e4f62bf73 Merge commit 'v2.6.35-rc6' into devicetree/next ... Conflicts: arch/sparc/kernel/prom_64.c		2010-07-24 09:49:13 -06:00
..
bbc_envctrl.c	of: Always use 'struct device.of_node' to get device node pointer.	2010-05-18 16:10:44 -06:00
bbc_i2c.c	sparc/of: Move of_device fields into struct pdev_archdata	2010-06-28 12:41:33 -07:00
bbc_i2c.h	bbc_i2c: Convert to pure OF driver.	2008-08-29 22:34:14 -07:00
display7seg.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
envctrl.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
flash.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
jsflash.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
Kconfig	sparc: Kill sbus mostek RTC driver.	2008-09-03 15:55:32 -07:00
Makefile	sparc: Kill sbus mostek RTC driver.	2008-09-03 15:55:32 -07:00
max1617.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
openprom.c	drivers/sbus: Remove unnecessary casts of private_data	2010-07-12 21:16:04 -07:00
uctrl.c	sparc/of: Move of_device fields into struct pdev_archdata	2010-06-28 12:41:33 -07:00