diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 23:25:34 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 23:25:34 +0200 |
commit | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (patch) | |
tree | c6d841ae9b73d6b7d6a887c21ce378cebc9c97f7 /security | |
parent | [PATCH] smc91x: disable DMA mode on the logicpd pxa270 (diff) | |
parent | Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-41ace1861a93f12f70ff10026fb1539fea38fcf8.tar.xz linux-41ace1861a93f12f70ff10026fb1539fea38fcf8.zip |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions