]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tile/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:03:22 +0000 (11:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:03:22 +0000 (11:03 +1000)
1  2 
mm/hugetlb.c

diff --cc mm/hugetlb.c
Simple merge