]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81372e6 e1533ba)
Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 29 Jun 2012 12:45:58 +0000 (14:45 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 29 Jun 2012 12:45:58 +0000 (14:45 +0200)
commit241493a3c03f84fc3d195f1c370a1d2dcb83137a
treeb913718405d44a921905ac71044fbde410256865tree | snapshot
parent81372e65e0ee3da08449b66d1aa387e4c674e483commit | diff
parente1533ba53046a667f200f0f4e995fde6274ee38ecommit | diff
Merge branch 'master' into for-next

Conflicts:
include/linux/mmzone.h

Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
include/linux/mmzone.h diff1 | diff2 | blob | history
mm/vmscan.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.