aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-07 21:02:16 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-07 21:02:16 -0500
commitd423421cb3e924cf68da231a732c3250c80afa4e (patch)
tree5b4cd07bd86bb3b2a4e249658a50146c867327f8 /drivers
parent850a9a4e3c019ce67e3bc29c810ac213ec4c169e (diff)
parent744bfe4c25716a7cfc5690aeab8d572b43d7c916 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* 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
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions