git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02d7fbe 322a8b0)
Merge branch 'linus' into cbus
authorTony Lindgren <tony@atomide.com>
Tue, 9 Aug 2011 10:45:56 +0000 (03:45 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 9 Aug 2011 10:45:56 +0000 (03:45 -0700)
Conflicts:
Documentation/feature-removal-schedule.txt
Makefile
fs/gfs2/glock.c
scripts/kconfig/confdata.c


Trivial merge
Pandora Kernel Repository