Linus Torvalds 7e599e6e62 drbd: fix up merge error ... In commit 95a0f10cdd ("drbd: store in-core bitmap little endian, regardless of architecture") drbd had made the sane choice to use little-endian bitmap functions everywhere. However, it used the horrible old functions names from <asm-generic/bitops/le.h>, that were never really meant to be exported. In the meantime, things got cleaned up, and in commit c4945b9ed4 ("asm-generic: rename generic little-endian bitops functions") we renamed the LE bitops to something sane, exactly so that they could be used in random code without people gouging their eyes out when seeing the crazy jumble of letters that were the old internal names. As a result the drbd thing merged cleanly (commit 8d49a77568: "Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block"), since there was no data conflict - but the end result obviously doesn't actually compile. Reported-and-tested-by: Ingo Molnar <mingo@elte.hu> Cc: Jens Axboe <jaxboe@fusionio.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2011-03-28 07:42:58 -07:00
..
aoe
drbd	drbd: fix up merge error	2011-03-28 07:42:58 -07:00
paride
amiflop.c	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
ataflop.c
brd.c
cciss_cmd.h	cciss: Inform controller we are using 32-bit tags.	2011-03-12 10:02:16 +01:00
cciss_scsi.c	Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation"	2011-03-12 13:47:51 +01:00
cciss_scsi.h
cciss.c	cciss: fix missed command status value CMD_UNABORTABLE	2011-03-12 10:02:30 +01:00
cciss.h	cciss: fix lost command issue	2011-03-23 20:47:11 +01:00
cpqarray.c
cpqarray.h
cryptoloop.c
DAC960.c
DAC960.h
floppy.c
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig
loop.c
Makefile
mg_disk.c
nbd.c
osdblk.c
pktcdvd.c
ps3disk.c
ps3vram.c
rbd_types.h
rbd.c	rbd: use watch/notify for changes in rbd header	2011-03-22 11:33:56 -07:00
smart1,2.h
sunvdc.c
swim3.c
swim_asm.S
swim.c
sx8.c
ub.c
umem.c
umem.h
viodasd.c
virtio_blk.c
xd.c
xd.h
xen-blkfront.c	Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm	2011-03-15 10:59:09 -07:00
xsysace.c	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
z2ram.c