Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Feb 2011 20:05:58 +0000 (12:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Feb 2011 20:05:58 +0000 (12:05 -0800)
commit8dbdea8444d303a772bceb1ba963f0e3273bfc5e
tree61364dc75d0f952e21d1fd112df0dde42a7dba3b
parentf0adc82064a5c28b34bdbc18e2d178c32094770b
parente66a022a80d73b1a5d2e02c9db2c42e8b9853b40
Merge branch 'ixp4xx' of git://git./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.