aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-frv/emergency-restart.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-31 18:50:43 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-31 18:50:43 -0500
commitf984d024190d5df98e448e35aa9e89a46fe50bb9 (patch)
tree7443594ff0a55bf0bc49fbcd90d1ec3334a4cb05 /include/asm-frv/emergency-restart.h
parentfc8744adc870a8d4366908221508bb113d8b72ee (diff)
parent5d0932a5dd00d83df5d1e15eeffb6edf015a8579 (diff)
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: igb: fix link reporting when using sgmii igb: prevent skb_over panic w/ mtu smaller than 1K igb: Fix DCA errors and do not use context index for 82576 ipv6: compile fix for ip6mr.c packet: Avoid lock_sock in mmap handler sfc: Replace stats_enabled flag with a disable count sfc: SFX7101/SFT9001: Fix AN advertisements sfc: SFT9001: Always enable XNP exchange on SFT9001 rev B sfc: Update board info for hardware monitor on SFN4111T-R5 and later sfc: Test for PHYXS faults whenever we cannot test link state bits sfc: Reinitialise the PHY completely in case of a PHY or NIC reset sfc: Fix post-reset MAC selection sfc: SFN4111T: Fix GPIO sharing between I2C and FLASH_CFG_1 sfc: SFT9001: Fix speed reporting in 1G PHY loopback sfc: SFX7101: Remove workaround for bad link training sfc: SFT9001: Enable robust link training sky2: fix hard hang with netconsoling and iface going up
Diffstat (limited to 'include/asm-frv/emergency-restart.h')
0 files changed, 0 insertions, 0 deletions