diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-04 17:30:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-04 17:30:12 +0100 |
| commit | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (patch) | |
| tree | c60c18f4fd4c0853feee6bb84b9fdadcb33e59e5 /drivers/watchdog | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | xfrm: Fix xfrm_policy_gc_lock handling. (diff) | |
| download | linux-75fa67706cce5272bcfc51ed646f2da21f3bdb6e.tar.xz linux-75fa67706cce5272bcfc51ed646f2da21f3bdb6e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
xfrm: Fix xfrm_policy_gc_lock handling.
niu: Use pci_ioremap_bar().
bnx2x: Version Update
bnx2x: Calling netif_carrier_off at the end of the probe
bnx2x: PCI configuration bug on big-endian
bnx2x: Removing the PMF indication when unloading
mv643xx_eth: fix SMI bus access timeouts
net: kconfig cleanup
fs_enet: fix polling
XFRM: copy_to_user_kmaddress() reports local address twice
SMC91x: Fix compilation on some platforms.
udp: Fix the SNMP counter of UDP_MIB_INERRORS
udp: Fix the SNMP counter of UDP_MIB_INDATAGRAMS
drivers/net/smc911x.c: Fix lockdep warning on xmit.
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions