aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-02 18:58:20 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-02 18:58:20 -0500
commitf6f7b52e2f6149d2ee365717afff315b05720162 (patch)
treee0851c336111141d1537d9e9fe57f443661f53d1 /drivers/net/pcmcia
parent51eaaa677691f8da526ce5a3d89e08ee2d2669ce (diff)
parent290172e79036fc25a22aaf3da4835ee634886183 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] hpwdt: Fix kdump when using hpwdt [WATCHDOG] hpwdt: set the mapped BIOS address space as executable [WATCHDOG] iTCO_wdt: add PCI ID's for ICH9 & ICH10 chipsets [WATCHDOG] iTCO_wdt : correct status clearing [WATCHDOG] iTCO_wdt : problem with rebooting on new ICH9 based motherboards [WATCHDOG] fix mtx1_wdt compilation failure
Diffstat (limited to 'drivers/net/pcmcia')
0 files changed, 0 insertions, 0 deletions