diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-06 12:05:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-06 12:05:58 -0800 |
| commit | 8dbdea8444d303a772bceb1ba963f0e3273bfc5e (patch) | |
| tree | 61364dc75d0f952e21d1fd112df0dde42a7dba3b /fs | |
| parent | f0adc82064a5c28b34bdbc18e2d178c32094770b (diff) | |
| parent | e66a022a80d73b1a5d2e02c9db2c42e8b9853b40 (diff) | |
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 'fs')
0 files changed, 0 insertions, 0 deletions