summaryrefslogtreecommitdiffstats
path: root/drivers/nubus
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-18 14:06:44 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-18 14:06:44 -0800
commit8b2d1833a29e9dc8bccad348396ad08666379d77 (patch)
treea7bb3bb922bb744934cc0d0bcce043ad8129ab0e /drivers/nubus
parentc9daa2722a3f1967e3e9750fd4cb6a7352a3cd63 (diff)
parentba596a01886b236c8171fc28d53842da0128224e (diff)
downloadop-kernel-dev-8b2d1833a29e9dc8bccad348396ad08666379d77.zip
op-kernel-dev-8b2d1833a29e9dc8bccad348396ad08666379d77.tar.gz
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (31 commits) Replace cpmac fix dl2k: the rest dl2k: MSCR, MSSR, ESR, PHY_SCR fixes dl2k: BMSR fixes dl2k: ANAR, ANLPAR fixes dl2k: BMCR_t fixes 3c574, 3c515 bitfields abuse sbni endian fixes wan/lmc bitfields fixes dscc4 endian fixes S2io: Fixed synchronization between scheduling of napi with card reset and close atl1: fix frame length bug Documentation: add a guideline for hard_start_xmit method Revert "sky2: remove check for PCI wakeup setting from BIOS" e1000e Kconfig: remove ref to nonexistant docs bonding: Don't hold lock when calling rtnl_unlock bonding: fix lock ordering for rtnl and bonding_rwsem bonding: Fix up parameter parsing bonding: release slaves when master removed via sysfs bonding: fix locking during alb failover and slave removal ...
Diffstat (limited to 'drivers/nubus')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud