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

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

drbd

Merge branch 'master' into for-2.6.35

2010-05-21 21:27:26 +02:00

paride

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

2010-04-09 11:50:29 -07:00

amiflop.c

m68k: amiga - Floppy platform device conversion

2010-05-17 21:37:45 +02:00

ataflop.c

ataflop: Killl warning about unused variable flags

2010-02-27 18:27:15 +01:00

brd.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

cciss_cmd.h

cciss: detect bad alignment of scsi commands at build time

2010-02-28 19:42:31 +01:00

cciss_scsi.c

cciss: Fix problem with scatter gather elements in the scsi half of the driver

2010-02-28 19:42:32 +01:00

cciss_scsi.h

cciss: remove C99-style comments

2010-02-22 13:44:45 +01:00

cciss.c

cciss: fix shadows sparse warning

2010-05-11 09:59:26 +02:00

cciss.h

cciss: do not use void pointer for scsi hba data

2010-02-28 19:42:32 +01:00

cpqarray.c

block: Consolidate phys_segment and hw_segment limits

2010-02-26 13:58:08 +01:00

cpqarray.h

Linux-2.6.12-rc2

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

cryptoloop.c

drivers: Remove unnecessary inclusions of asm/semaphore.h

2008-04-18 22:16:32 -04:00

DAC960.c

block: Finalize conversion of block limits functions

2010-03-15 12:47:59 +01:00

DAC960.h

Fix DAC960 driver on machines which don't support 64-bit DMA

2007-09-11 17:21:19 -07:00

floppy.c

drivers/block/floppy.c: remove unnecessary casting in fd_ioctl

2010-03-12 15:52:31 -08:00

hd.c

Merge commit 'v2.6.34-rc6' into core/locking

2010-05-03 09:17:01 +02:00

ida_cmd.h

Linux-2.6.12-rc2

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

ida_ioctl.h

Linux-2.6.12-rc2

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

Kconfig

paride: fix menu indentation

2010-05-11 09:02:55 +02:00

loop.c

sanitize vfs_fsync calling conventions

2010-05-21 18:31:21 -04:00

Makefile

The DRBD driver

2009-10-01 21:17:49 +02:00

mg_disk.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

nbd.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

osdblk.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

pktcdvd.c

pktcdvd: improve BKL and compat_ioctl.c usage

2010-04-29 08:44:37 -07:00

ps3disk.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

ps3vram.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

smart1,2.h

Linux-2.6.12-rc2

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

sunvdc.c

block: Consolidate phys_segment and hw_segment limits

2010-02-26 13:58:08 +01:00

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

m68k: mac - Add SWIM floppy support

2009-03-26 21:15:27 +01:00

swim.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

sx8.c

block: Consolidate phys_segment and hw_segment limits

2010-02-26 13:58:08 +01:00

ub.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

umem.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

umem.h

drivers/block/umem: trim trailing whitespace

2007-10-10 09:25:59 +02:00

viodasd.c

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

virtio_blk.c

virtio_blk: use virtqueue_xxx wrappers

2010-05-19 22:15:42 +09:30

xd.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

xd.h

[PATCH] switch xd

2008-10-21 07:48:11 -04:00

xen-blkfront.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

xsysace.c

of: Remove duplicate fields from of_platform_driver

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

z2ram.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