diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 08:02:04 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 08:02:04 -0800 |
commit | 9ef38eaf4289a99beb3bc13d1ded220a68cc8877 (patch) | |
tree | 7c9a3cb302aa28efe1f1d5b794c4fe010f13e388 /include/linux/slab.h | |
parent | cf91b824bb2bdea8a47bf6bb94cf3a438683e5eb (diff) | |
parent | 7f4da4745c34287938ce76b92b23409adeecb5b8 (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] HP ProLiant WatchDog driver
[WATCHDOG] blackfin Watchdog driver: relocate all strings used in __init functions to __initdata
[WATCHDOG] Convert mtx1 wdt to be a platform device and use generic GPIO API
[WATCHDOG] Add support for SB1 hardware watchdog
Diffstat (limited to 'include/linux/slab.h')
0 files changed, 0 insertions, 0 deletions