diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:15:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:15:12 -0500 |
| commit | e691d24e9c5007486bef59c589c2a2d784e0c30b (patch) | |
| tree | 29e146443430d934f076d89a4bbf035c33586aa9 /drivers/watchdog/mv64x60_wdt.c | |
| parent | 55065bc52795faae549abfb912aacc622dd63876 (diff) | |
| parent | b5318d302f8a20eacbbfc01b0ee35b108085a363 (diff) | |
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, olpc: Speed up device tree creation during boot
x86, olpc: Add OLPC device-tree support
x86, of: Define irq functions to allow drivers/of/* to build on x86
Diffstat (limited to 'drivers/watchdog/mv64x60_wdt.c')
0 files changed, 0 insertions, 0 deletions