projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74eec26 dd3c467)
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
arch/s390/oprofile/hwsampler.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/s390/oprofile/hwsampler.c
Simple merge
John Crispins staging tree