git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e182c77 0d0fb0f)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 07:28:45 +0000 (00:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 07:28:45 +0000 (00:28 -0700)
Conflicts:
lib/Kconfig.debug


Trivial merge
Pandora Kernel Repository