| commit | f701737deb59654dd62e15d5dc379f387cf86c6d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jun 14 15:06:49 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jun 14 15:06:49 2007 -0700 |
| tree | b9073b7d4b43bc3d39c2ba1ddc76a1d0698073de | |
| parent | eedab661a51966c454e38c17266a531aa58b4a98 [diff] | |
| parent | 6c1640d52b9b7355cd777c4f08bc930ac96d905b [diff] |
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