From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 6 Jan 2008 22:35:19 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: upstream/snapshot3+hdmi~28566
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b300d204738a70fa62c38583905a6989b3cedcd;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4691/1: add missing i2c_board_info struct for at91rm9200
  [ARM] 4735/1: Unbreak pxa25x suspend/resume
---

2b300d204738a70fa62c38583905a6989b3cedcd