Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 21 Mar 2009 20:23:01 +0000 (13:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Mar 2009 20:23:01 +0000 (13:23 -0700)
commited36604b25023c584fdf93df6073f65dac4b1129
tree9bc35b4174f18af727f7d73b32e16efad85fce93
parent3f518390ab1b65bc2e2bc01774eb2c5918c433ee
parent1329f4550f8ee141437f3b5f4db0f2add7639e29
Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6
drivers/atm/solos-pci.c