From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Oct 2011 14:29:40 +0000 (-0700)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: Ubuntu-5.2.0-15.16~19454
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=249842477c589ea29ff161ace9c8666d96e9883a;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  ARM: mark empty gpio.h files empty
  gpio: Fix ARM versatile-express build failure
  of: include errno.h
---

249842477c589ea29ff161ace9c8666d96e9883a