From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Aug 2011 06:49:57 +0000 (-1000)
Subject: Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.1-rc1~83
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a6b11f53388973d99c4a357c22b19753b424e73c;p=~emulex%2Finfiniband.git

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

* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
  MAINTAINERS: Add keyword match for of_match_table to device tree section
  of: constify property name parameters for helper functions
  input: xilinx_ps2: Add missing of_address.h header
  of: address: use resource_size helper
---

a6b11f53388973d99c4a357c22b19753b424e73c