summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-15 00:06:49 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-15 00:06:49 +0200
commitf701737deb59654dd62e15d5dc379f387cf86c6d (patch)
treeb9073b7d4b43bc3d39c2ba1ddc76a1d0698073de /drivers
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff)
parent[ARM] 4445/1: ANUBIS: Fix CPLD registers (diff)
downloadlinux-f701737deb59654dd62e15d5dc379f387cf86c6d.tar.xz
linux-f701737deb59654dd62e15d5dc379f387cf86c6d.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4445/1: ANUBIS: Fix CPLD registers [ARM] 4444/2: OSIRIS: CPLD suspend fix [ARM] 4443/1: OSIRIS: Add watchdog device to machine devices [ARM] 4442/1: OSIRIS: Fix CPLD register definitions [ARM] VFP: fix section mismatch error
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions