path: root/drivers/net
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-12 15:12:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-12 15:12:24 -0800
commit983ca83634c1615b4f3a7b3bbe00e64678257f42 (patch)
tree3c13ec9276c533f371805e924d6af618f4a2cc94 /drivers/net
parent41a7973447b0b8717f0a214d4328dc31ec2291d7 (diff)
parent893db07f50596bd42248dcffbe8157abc7204bdd (diff)
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into akpm
Pull ARM SoC fixes from Olof Johansson: "We had a number of fixes queued up, but taking a strict pass-through and weeding out any that either have been broken for a while, or are for platforms that need out-of-tree code to be useful anyway, or other fixes for problems that few users are likely to see in real life, only this short branch of patches remains. The three patches here are to make SMP boot work on the Calxeda platforms again. Some of the rework for cpuids on 3.8 broke it (and it was discovered late, unfortunately)." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: highbank: mask cluster id from cpu_logical_map ARM: scu: mask cluster id from cpu_logical_map ARM: scu: add empty scu_enable for !CONFIG_SMP
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions