Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6
David S. Miller [Tue, 22 Sep 2009 22:18:59 +0000 (15:18 -0700)]
1  2 
drivers/atm/solos-pci.c

Simple merge