Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 18 Aug 2007 17:28:21 +0000 (10:28 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 18 Aug 2007 17:28:21 +0000 (10:28 -0700)
commit18115f45374d19ada218fc013aa5308baf5d283e
tree820dbd1f044c3384f0bcb3ba42c211e24aa0bc0b
parentf0f12d85af8593e45fdf4a4d4c7cad240a6787a2
parentdaa7162f66ec7f85053b623a3d23ee30b13d036c
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4549/1: KS8695: Fix build errors
  [ARM] 4546/1: s3c2410: fix architecture typo for s3c2442
  [ARM] 4544/1: arm: fix section mismatch in pxa fb