1. 28 Jun, 2011 37 commits
  2. 09 Jun, 2011 3 commits
    • Greg Kroah-Hartman's avatar
      Merge Linus's tree into staging-next · dc5a1894
      Greg Kroah-Hartman authored
      This was done to resolve the conflicts that were in a number of files
      due to changes done upstream with others done in the staging-next
      branch.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      dc5a1894
    • Greg Kroah-Hartman's avatar
      Staging: brcm80211: disable drivers for PPC platforms · c7732987
      Greg Kroah-Hartman authored
      Right now, bad things happen if you try to build these drivers for the
      PPC platform as it seems that the code only has been tested and built on
      the MIPS big endian platform.
      
      So disable it on the PPC32 and PPC64 platforms for now, hopefully this
      will be resolved in the future as I'm sure someone will want to use
      these chips with that platform someday.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Henry Ptasinski <henryp@broadcom.com>
      Cc: Brett Rudley <brudley@broadcom.com>
      Cc: Roland Vossen <rvossen@broadcom.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      c7732987
    • Linus Torvalds's avatar
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 461df4de
      Linus Torvalds authored
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
        staging: iio: max517: Fix iio_info changes
        Staging: mei: fix debug code
        Staging: cx23885: fix include of altera.h
        staging: iio: error case memory leak fix
        staging: ath6kl: Fix a kernel panic during suspend/resume
        staging: gma500: get control from firmware framebuffer if conflicts
        staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight
        staging: usbip: bugfix prevent driver unbind
        staging: iio: industrialio-trigger: set iio_poll_func private_data
        staging: rts_pstor: use bitwise operator instead of logical one
        staging: fix ath6kl build when CFG80211 is not enabled
        staging: brcm80211: fix for 'multiple definition of wl_msg_level' build err
        staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE
        Staging: remove STAGING_EXCLUDE_BUILD option
        Staging: altera: move .h file to proper place
      461df4de