| commit | 2b300d204738a70fa62c38583905a6989b3cedcd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Jan 06 14:35:19 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Jan 06 14:35:19 2008 -0800 |
| tree | a1253066be264309ee436f273fe2a90cce98e799 | |
| parent | 3ce54450461bad18bbe1f9f5aa3ecd2f8e8d1235 [diff] | |
| parent | 430cb436103ce1b58cb80e7c3d44f4d4a8110caa [diff] |
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