David Woodhouse 2144381da4 Merge branch 'async' of macbook:git/btrfs-unstable ...

Conflicts:
	drivers/md/Makefile
	lib/raid6/unroll.pl

2010-08-09 10:36:44 +01:00

..

raid6test

Merge branch 'async' of macbook:git/btrfs-unstable

2010-08-09 10:36:44 +01:00

Makefile

Merge branch 'async' of macbook:git/btrfs-unstable

2010-08-09 10:36:44 +01:00

mktables.c

…

raid6algos.c

Merge branch 'async' of macbook:git/btrfs-unstable

2010-08-09 10:36:44 +01:00

raid6altivec.uc

Merge branch 'async' of macbook:git/btrfs-unstable

2010-08-09 10:36:44 +01:00

raid6int.uc

Merge branch 'async' of macbook:git/btrfs-unstable

2010-08-09 10:36:44 +01:00

raid6mmx.c

…

raid6recov.c

…

raid6sse1.c

…

raid6sse2.c

…

raid6x86.h

…

unroll.awk

Merge branch 'async' of macbook:git/btrfs-unstable

2010-08-09 10:36:44 +01:00