]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'core/locking'
authorIngo Molnar <mingo@kernel.org>
Thu, 27 Jun 2013 14:20:51 +0000 (16:20 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 27 Jun 2013 14:20:51 +0000 (16:20 +0200)
1  2 
mm/hugetlb.c

diff --cc mm/hugetlb.c
Simple merge