git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4387ff7 dc2e2f3)
Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 8 Feb 2007 23:25:18 +0000 (15:25 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 8 Feb 2007 23:25:18 +0000 (15:25 -0800)
Conflicts:

crypto/Kconfig


Trivial merge
Pandora Kernel Repository