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

Browse source

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3353/1: NAS100d: protect  nas100d_power_exit() with machine_is_nas100d()
  [ARM] 3352/1: DSB required for the completion of a TLB maintenance operation

...

This commit is contained in:

Linus Torvalds 2006-03-07 18:02:16 -08:00

parent 850a9a4e3c 744bfe4c25

commit d423421cb3

4 changed files with 11 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

2

arch/arm/Kconfig

View file

3

arch/arm/mach-ixp4xx/nas100d-power.c

View file

1

arch/arm/mm/tlb-v6.S

View file

6

include/asm-arm/tlbflush.h

View file