]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit909bbbfd42471969311b1849e1616549c6b8ced1
tree61364dc75d0f952e21d1fd112df0dde42a7dba3b
parent01b67ef46f6489c0a653052cc548fa81a2ce90f5
parent46153b4d38b92b9db01fbc3da22302cfcb95edda
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.