]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.3' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 4 Jan 2012 22:02:35 +0000 (17:02 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 4 Jan 2012 22:02:35 +0000 (17:02 -0500)
* stable/for-linus-3.3:
  xen/xenbus: don't reimplement kvasprintf via a fixed size buffer
  xenbus: maximum buffer size is XENSTORE_PAYLOAD_MAX
  xen/xenbus: Reject replies with payload > XENSTORE_PAYLOAD_MAX.
  Xen: consolidate and simplify struct xenbus_driver instantiation


Trivial merge