From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Feb 2011 20:05:58 +0000 (-0800)
Subject: Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
X-Git-Tag: v2.6.38-rc4~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dbdea8444d303a772bceb1ba963f0e3273bfc5e;p=profile%2Fcommon%2Fkernel-common.git

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.
---

8dbdea8444d303a772bceb1ba963f0e3273bfc5e