Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6
David S. Miller [Sat, 21 Mar 2009 20:23:01 +0000 (13:23 -0700)]
1  2 
drivers/atm/solos-pci.c

Simple merge