git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45d7f32 e5d8497)
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)
Conflicts:
drivers/md/Makefile
lib/raid6/unroll.pl


Trivial merge
Pandora Kernel Repository