From: Linus Torvalds Date: Sat, 28 May 2011 17:57:39 +0000 (-0700) Subject: Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d02bf062fbb5e714d84ecefd05106062b9a45159;p=linux-beck.git Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: spi/spi_bfin_sport: new driver for a SPI bus via the Blackfin SPORT peripheral spi/tle620x: add missing device_remove_file() --- d02bf062fbb5e714d84ecefd05106062b9a45159