]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 850a9a4 744bfe4)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Mar 2006 02:02:16 +0000 (18:02 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Mar 2006 02:02:16 +0000 (18:02 -0800)
* 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


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG