diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-07 16:26:41 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-07 16:26:41 +0100 |
commit | 66ee156078697cdc013d46aed3b2fee445c325a1 (patch) | |
tree | cdff6539fa339d4bdf11934778dd93f3c3225dad /sound | |
parent | Merge branch 'fb' into devel (diff) | |
parent | Merge branch 'atags' into for-rmk (diff) | |
parent | [ARM] mach-types update (diff) | |
download | linux-dev-66ee156078697cdc013d46aed3b2fee445c325a1.tar.xz linux-dev-66ee156078697cdc013d46aed3b2fee445c325a1.zip |
Merge branches 'ns9x' and 'machtypes' into devel