From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Mar 2013 01:05:37 +0000 (-0700)
Subject: Merge tag 'for-3.9-rc3' of git://openrisc.net/jonas/linux
X-Git-Tag: v3.9-rc3~5
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=236595879b5f838e907d33456b12f3cc23d559bf;p=~andy%2Flinux

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
---

236595879b5f838e907d33456b12f3cc23d559bf