summaryrefslogtreecommitdiffstats
path: root/drivers/ps3
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-01 01:39:06 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-01 01:39:06 +0100
commit4ec8f077e4dd51f713984669781e7b568b8c41e2 (patch)
tree4c951595e2824b19ca9d9c7190a6046481322c14 /drivers/ps3
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 (diff)
parentMerge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmia... (diff)
downloadlinux-4ec8f077e4dd51f713984669781e7b568b8c41e2.tar.xz
linux-4ec8f077e4dd51f713984669781e7b568b8c41e2.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: Allow architectures to override copy_user_highpage() [ARM] pxa/palmtx: misc fixes to use generic GPIO API ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling [ARM] pxa/corgi: update default config to exclude tosa from being built [ARM] pxa/pcm990: use negative number for an invalid GPIO in camera data ARM: OMAP: Typo fix for clock_allow_idle ARM: OMAP: Remove broken LCD driver for SX1 [ARM] 5335/1: pxa25x_udc: Fix is_vbus_present to return 1 or 0 [ARM] pxa/MioA701: bluetooth resume fix [ARM] pxa/MioA701: fix memory corruption.
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions