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
..
aoe
drbd	Merge branch 'master' into for-2.6.35	2010-05-21 21:27:26 +02:00
paride
amiflop.c
ataflop.c
brd.c
cciss_cmd.h
cciss_scsi.c
cciss_scsi.h
cciss.c
cciss.h
cpqarray.c
cpqarray.h
cryptoloop.c
DAC960.c
DAC960.h
floppy.c
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig
loop.c	sanitize vfs_fsync calling conventions	2010-05-21 18:31:21 -04:00
Makefile
mg_disk.c
nbd.c
osdblk.c
pktcdvd.c
ps3disk.c
ps3vram.c
smart1,2.h
sunvdc.c
swim3.c	of: Always use 'struct device.of_node' to get device node pointer.	2010-05-18 16:10:44 -06:00
swim_asm.S
swim.c
sx8.c
ub.c
umem.c
umem.h
viodasd.c
virtio_blk.c	virtio_blk: use virtqueue_xxx wrappers	2010-05-19 22:15:42 +09:30
xd.c
xd.h
xen-blkfront.c
xsysace.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
z2ram.c