From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Apr 2008 18:26:26 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.25-rc8~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d5f1a21ca05cad212829460ee7900915128e3401;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4875/1: Add MODULE_ALIAS to ixp4xx-beeper module
  [ARM] 4873/1: Fix ITE 8152 interrupt demux
  [ARM] 4878/1: Add oabi shim for fstatat64
---

d5f1a21ca05cad212829460ee7900915128e3401