]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slab/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 01:47:07 +0000 (12:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 01:47:07 +0000 (12:47 +1100)
commit045215ceb56e329a0dc81c28762ebdae04403b11
tree536dd54b6d5f28dc1b75f195cc2893a8c0398e35
parenta24c1cadc4f76d0a6f3f3740609663e2f60fe88a
parent31841eb092844119636bb3d28ea14e6fae189ab4
Merge remote-tracking branch 'slab/for-next'

Conflicts:
mm/slob.c