]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slab/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 01:29:28 +0000 (12:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 01:29:28 +0000 (12:29 +1100)
commit40dfcb761dfe0428dccab2d541555a8296b54934
tree6bf981f9129a7e264c431f8e494e5f0d521ee999
parentda00414f23f32ca65e7c0cc7cdc8f188c619520c
parentf1d58d715a1d8b937eb8f89c593e55fa7534eb6a
Merge remote-tracking branch 'slab/for-next'

Conflicts:
mm/slob.c