git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b1ac75 e559e91)
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Sun, 15 Jul 2007 06:47:04 +0000 (23:47 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 15 Jul 2007 06:47:04 +0000 (23:47 -0700)
Conflicts:

crypto/Kconfig


Trivial merge
Pandora Kernel Repository