diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-06 21:05:58 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-06 21:05:58 +0100 |
commit | 8dbdea8444d303a772bceb1ba963f0e3273bfc5e (patch) | |
tree | 61364dc75d0f952e21d1fd112df0dde42a7dba3b /arch/arm/tools | |
parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | arm/ixp4xx: Rename FREQ macro to avoid collisions (diff) | |
download | linux-8dbdea8444d303a772bceb1ba963f0e3273bfc5e.tar.xz linux-8dbdea8444d303a772bceb1ba963f0e3273bfc5e.zip |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
arm/ixp4xx: Rename FREQ macro to avoid collisions
IXP4xx: Fix qmgr_release_queue() flushing unexpected queue entries.
Diffstat (limited to 'arch/arm/tools')
0 files changed, 0 insertions, 0 deletions