summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-07 15:20:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-07 15:20:11 -0800
commit65d9055ea39c07671bc41a8cd1ace9aaa6e1bc70 (patch)
tree2d0b8a353f6ffa9bf0924ff777f366778ddaa7d6 /Makefile
parentcb5520f02c010e3cb974b9ac06f30aafa2eebc38 (diff)
parent1f63b9546a8c7b90de2d9e52cf8ff07f9f653d94 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: ALSA: AACI: allow writes to MAINCR to take effect ARM: Update mach-types ARM: 6652/1: ep93xx: correct the end address of the AC97 memory resource ARM: mxs/imx28: remove now unused clock lookup "fec.0" ARM: mxs: fix clock base address missing ARM: mxs: acknowledge gpio irq ARM: mach-imx/mach-mx25_3ds: Fix section type ARM: imx: Add VPR200 and MX51_3DS entries to uncompress.h ARM i.MX23: use correct register for setting the rate ARM i.MX23/28: remove secondary field from struct clk. It's unused ARM i.MX28: use correct register for setting the rate ARM i.MX28: fix bit operation
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions