diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-23 17:25:24 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-23 17:25:24 +0100 |
commit | 12a37b5e2c93f6550b82490c3de6d4eedc509c39 (patch) | |
tree | 8407735b0d569792ec255a2627b533e403d60663 /drivers/mfd/mcp.h | |
parent | fix ptrace slowness (diff) | |
parent | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (diff) | |
download | linux-12a37b5e2c93f6550b82490c3de6d4eedc509c39.tar.xz linux-12a37b5e2c93f6550b82490c3de6d4eedc509c39.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix crash with /proc/iomem
sparc64: Reschedule KGDB capture to a software interrupt.
sbus: Auto-load openprom module when device opened.
Diffstat (limited to 'drivers/mfd/mcp.h')
0 files changed, 0 insertions, 0 deletions