Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 18 Mar 2013 09:57:32 +0000 (10:57 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 18 Mar 2013 09:57:57 +0000 (10:57 +0100)
Sync with Linus' tree to be able to apply patch to the newly
added ITG-3200 driver.

1  2 
mm/hugetlb.c

diff --cc mm/hugetlb.c
Simple merge