diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 21:22:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 21:22:33 -0800 |
commit | b9e222904ce92e1b277f2b85411d1eb6bfe27410 (patch) | |
tree | 9458158ea70e6025723c53afc64ed61d044580b8 /include/asm-arm/ide.h | |
parent | 4a0962abd187df29b7d1378b2f372a55667d54c0 (diff) | |
parent | d4eac7501f737c70420f38e9fd59de77a4ba6c13 (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Remove unused CONFIG_WANT_DEVICE_TREE
[POWERPC] Cell RAS: Remove DEBUG, and add license and copyright
[POWERPC] hvc_rtas_init() must be __init
[POWERPC] free_property() must not be __init
[POWERPC] vdso_do_func_patch{32,64}() must be __init
[POWERPC] Remove generated files on make clean
[POWERPC] Fix arch/ppc compilation - add typedef for pgtable_t
[POWERPC] Wire up new timerfd syscalls
[POWERPC] PS3: Update sys-manager button events
[POWERPC] PS3: Sys-manager code cleanup
[POWERPC] PS3: Use system reboot on restart
[POWERPC] PS3: Fix bootwrapper hang bug
[POWERPC] PS3: Fix reading pm interval in logical performance monitor
[POWERPC] PS3: Fix setting bookmark in logical performance monitor
[POWERPC] Fix DEBUG_PREEMPT warning when warning
Diffstat (limited to 'include/asm-arm/ide.h')
0 files changed, 0 insertions, 0 deletions