tree 820dbd1f044c3384f0bcb3ba42c211e24aa0bc0b
parent f0f12d85af8593e45fdf4a4d4c7cad240a6787a2
parent daa7162f66ec7f85053b623a3d23ee30b13d036c
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1187458101 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1187458101 -0700

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