summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-15 18:05:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-15 18:05:37 -0700
commit236595879b5f838e907d33456b12f3cc23d559bf (patch)
tree5cba90ef4622ed676cb52610dbe6cf8da732e0ac /scripts
parent9e1a0aab60b3d4a6650690862153f11fceddb80d (diff)
parent6af609515d788bd4c94116344f00601b058f75a6 (diff)
downloadblackbird-obmc-linux-236595879b5f838e907d33456b12f3cc23d559bf.tar.gz
blackbird-obmc-linux-236595879b5f838e907d33456b12f3cc23d559bf.zip
Merge tag 'for-3.9-rc3' of git://openrisc.net/jonas/linux
Pull OpenRISC bug fixes from Jonas Bonn: - The GPIO descriptor work has exposed how broken the non-GPIOLIB bits for OpenRISC were. We now require GPIOLIB as this is the preferred way forward. - The system.h split introduced a bug in llist.h for arches using asm-generic/cmpxchg.h directly, which is currently only OpenRISC. The patch here moves two defines from asm-generic/atomic.h to asm-generic/cmpxchg.h to make things work as they should. - The VIRT_TO_BUS selector was added for OpenRISC, but OpenRISC does not have the virt_to_bus methods, so there's a patch to remove it again. * tag 'for-3.9-rc3' of git://openrisc.net/jonas/linux: openrisc: remove HAVE_VIRT_TO_BUS asm-generic: move cmpxchg*_local defs to cmpxchg.h openrisc: require gpiolib
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud