From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 18 Aug 2007 17:28:21 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=18115f45374d19ada218fc013aa5308baf5d283e;p=openwrt%2Fstaging%2Fblogic.git

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
---

18115f45374d19ada218fc013aa5308baf5d283e