diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-08 00:20:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-08 00:20:11 +0100 |
| commit | 65d9055ea39c07671bc41a8cd1ace9aaa6e1bc70 (patch) | |
| tree | 2d0b8a353f6ffa9bf0924ff777f366778ddaa7d6 /Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
| parent | Merge branch 'fixes' (diff) | |
| download | linux-65d9055ea39c07671bc41a8cd1ace9aaa6e1bc70.tar.xz linux-65d9055ea39c07671bc41a8cd1ace9aaa6e1bc70.zip | |
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