]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'stable/for-linus-3.3.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 15 Feb 2012 15:48:24 +0000 (10:48 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 15 Feb 2012 15:48:24 +0000 (10:48 -0500)
* stable/for-linus-3.3.rebased:
  xenbus_dev: add missing error check to watch handling


Trivial merge