commit | 237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.osdl.org> | Thu Nov 16 12:22:52 2006 -0800 |
committer | Linus Torvalds <torvalds@woody.osdl.org> | Thu Nov 16 12:22:52 2006 -0800 |
tree | 8bc42df168da6bd8545e90487f1f7c324aba486c | |
parent | d0cac32fa551b0e7dc1f014607eabb93b0ebbbe8 [diff] | |
parent | aa8d18731508bb0a16f69b77e5f4541f0d6fb553 [diff] |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Remove OP_MAX_COUNTER [ARM] Remove PM_LEGACY=y from selected ARM defconfigs [ARM] 3857/2: pnx4008: add devices' registration