Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6
commitefb064dec6e35618ddc04f3ba49f70e528fbe069
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Sep 2009 22:18:59 +0000 (22 15:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Sep 2009 22:18:59 +0000 (22 15:18 -0700)
tree80b2ce669120e86a52620bf2f3af09e9244eb5a1
parentfcd195cdfdd52b18a977581a254455ff48080fc3
parent69a9ceab83928e743fafbba5b98bd09aed7c0e0d
Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6
drivers/atm/solos-pci.c