]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f70cac8 8e6f83b)
Merge branch 'pm' into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Sep 2011 21:39:23 +0000 (22:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Sep 2011 21:39:23 +0000 (22:39 +0100)
1  2 
arch/arm/kernel/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/kernel/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.