From: Linus Torvalds Date: Fri, 24 Sep 2010 20:55:12 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 X-Git-Tag: v2.6.36-rc6~38 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=06706b5847318294b91b49a0b4f85d281d33adc8;p=~emulex%2Finfiniband.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: ti-st: remove st_get_plat_device --- 06706b5847318294b91b49a0b4f85d281d33adc8