Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel

Browse source

...

This commit is contained in:

Russell King 2009-05-25 13:35:46 +01:00 • committed by Russell King

parent 56a459314a 9733bb8e9c

commit 9af5324a07

3 changed files with 21 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

22

arch/arm/mach-ixp4xx/include/mach/qmgr.h

View file

13

drivers/net/arm/ixp4xx_eth.c

View file

9

drivers/net/wan/ixp4xx_hss.c

View file