diff options
author | 2011-02-06 12:05:58 -0800 | |
---|---|---|
committer | 2011-02-06 12:05:58 -0800 | |
commit | 8dbdea8444d303a772bceb1ba963f0e3273bfc5e (patch) | |
tree | 61364dc75d0f952e21d1fd112df0dde42a7dba3b /include/drm | |
parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | arm/ixp4xx: Rename FREQ macro to avoid collisions (diff) | |
download | linux-dev-8dbdea8444d303a772bceb1ba963f0e3273bfc5e.tar.xz linux-dev-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 'include/drm')
0 files changed, 0 insertions, 0 deletions