Merge branch 'async' of macbook:git/btrfs-unstable
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 9 Aug 2010 09:36:44 +0000 (10:36 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 9 Aug 2010 09:36:44 +0000 (10:36 +0100)
commit2144381da478cc4aa3a29ee29b0c5e6ddaaced14
tree380a29fec86b537ed602d12f4050654b1c66c27c
parent45d7f32c7a43cbb9592886d38190e379e2eb2226
parente5d84970a554d5c0072043a7b9f0f5b88b5fdfe1
Merge branch 'async' of macbook:git/btrfs-unstable

Conflicts:
drivers/md/Makefile
lib/raid6/unroll.pl
crypto/async_tx/Kconfig
drivers/md/Kconfig
drivers/md/Makefile
lib/Kconfig
lib/Makefile
lib/raid6/Makefile
lib/raid6/raid6algos.c
lib/raid6/raid6altivec.uc
lib/raid6/raid6int.uc
lib/raid6/raid6test/Makefile
lib/raid6/unroll.awk