diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 23:34:11 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 23:34:11 +0100 |
commit | 474118d06d1d5053f27450224f0541219483ec69 (patch) | |
tree | ed97d32609bd5c835ec087b2e0cac10ab77b9dff /COPYING | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | [ARM] Update mach-types (diff) | |
download | linux-474118d06d1d5053f27450224f0541219483ec69.tar.xz linux-474118d06d1d5053f27450224f0541219483ec69.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Update mach-types
[ARM] orion5x: D-link DNS-323 rev. B1 power-off
[ARM] Orion5x: add GPIO LED and buttons for wrt350n v2
[ARM] pxa: fix irq suspend/resume for pxa25x
[ARM] pxa: fix the incorrect naming of AC97 reset pin config for pxa26x
[ARM] pxa/corgi: fix incorrect default GPIO for UDC Vbus
[ARM] Kirkwood: drive USB VBUS pin on rd88f6192-nas high on boot
[ARM] Orion: fix PCIe inbound window programming when RAM size is not a power of two
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions