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

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2008-01-06 14:35:19 -08:00

parent 3ce5445046 430cb43610

commit 2b300d2047

2 changed files with 21 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

arch/arm/mach-at91/board-ek.c

View file

13

arch/arm/mach-pxa/pxa25x.c

View file