commit 3ab47029d91993745212624e49d16a75abc8f207
author Linus Torvalds <torvalds@linux-foundation.org> Fri Aug 26 13:05:09 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Aug 26 13:05:09 2011 -0700
tree e0953f10e43bfaa9a3567ebe2c45a20a21d8e80b
parent 0cf0adb073908a66b6875ef8e016b235b9d43ee3
parent 651d62a8b0378b911f083a1712d9d228894f46d8

Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  drivers:misc: ti-st: fix unexpected UART close
  drivers:misc: ti-st: free skb on firmware download
  drivers:misc: ti-st: wait for completion at fail
  drivers:misc: ti-st: reinit completion before send
  drivers:misc: ti-st: fail-safe on wrong pkt type
  drivers:misc: ti-st: reinit completion on ver read
  drivers:misc:ti-st: platform hooks for chip states
  drivers:misc: ti-st: avoid a misleading dbg msg
  base/devres.c: quiet sparse noise about context imbalance
  pti: add missing CONFIG_PCI dependency
  drivers/base/devtmpfs.c: correct annotation of `setup_done'
  driver core: fix kernel-doc warning in platform.c
  firmware: fix google/gsmi.c build warning