summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-02 01:47:26 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-02 01:47:26 +0100
commitb6ef977b608b01e0f338afd9445cab5436c61e00 (patch)
tree5af86a7d3e222ff55292655b06601fa5798c0564 /drivers/ata
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff)
parentMerge ../linux-2.6-watchdog-mm (diff)
downloadlinux-b6ef977b608b01e0f338afd9445cab5436c61e00.tar.xz
linux-b6ef977b608b01e0f338afd9445cab5436c61e00.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 4 [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 3 [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 2 [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 1 [WATCHDOG] MIPS RM9000 on-chip watchdog device [WATCHDOG] Add iTCO vendor specific support [WATCHDOG] sc1200wdt.c pnp unregister fix. [WATCHDOG] config.h removal [WATCHDOG] NS pc87413-wdt Watchdog driver - fixes [WATCHDOG] NS pc87413-wdt Watchdog driver v1.1 [WATCHDOG] NS pc87413-wdt Watchdog driver
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions