summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 04:15:50 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 04:15:50 +0200
commita39727f212426b9d5f9267b3318a2afaf9922d3b (patch)
treee42d5834dd5b0844552c076c1d264ab0e35396f6 /security
parentMerge git://git.infradead.org/mtd-2.6 (diff)
parent[netdrvr] Remove long-unused bits from Becker template drivers (diff)
downloadlinux-a39727f212426b9d5f9267b3318a2afaf9922d3b.tar.xz
linux-a39727f212426b9d5f9267b3318a2afaf9922d3b.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [netdrvr] Remove long-unused bits from Becker template drivers [netdrvr] natsemi: minor cleanups [netdrvr] natsemi: Separate out media initialization code [PATCH] WAN: update info page for a bunch of my drivers [PATCH] drivers/net/hamradio/dmascc.c: fix section mismatch [PATCH] Fix phy id for LXT971A/LXT972A [PATCH] DM9000 - minor code cleanups [PATCH] DM9000 - do no re-init spin lock [PATCH] DM9000 - check for MAC left in by bootloader [PATCH] DM9000 - better checks for platform resources
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions