]> 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, 30 Nov 2011 18:40:19 +0000 (13:40 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 30 Nov 2011 18:40:19 +0000 (13:40 -0500)
* stable/for-linus-3.3:
  xen/ia64: fix build breakage because of conflicting u64 guest handles


Trivial merge