alistair23-linux/drivers/staging/olpc_dcon
Linus Torvalds df9b29d13e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
  staging: usbip: bugfix for isochronous packets and optimization
  staging: usbip: bugfix add number of packets for isochronous frames
  staging: usbip: bugfixes related to kthread conversion
  staging: usbip: fix shutdown problems.
  staging: hv: Fix GARP not sent after Quick Migration
  staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
  staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
  staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
  staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
  staging: IIO: IMU: ADIS16400: Add delay after self test
  staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
  staging/rtl81*: build as loadable modules only
  staging: brcm80211: removed 'is_amsdu causing toss' log spam
  staging: brcm80211: fix for 'Short CCK' log spam
  staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
  staging: memrar: remove driver from tree
  staging: sep: remove last memrar remnants
  staging: fix hv_mouse build, needs delay.h
  staging: fix olpc_dcon build errors
  staging: sm7xx: fixed defines
  ...

Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)
2011-04-07 11:36:44 -07:00
..
Kconfig staging: fix olpc_dcon build errors 2011-04-04 21:37:04 -07:00
Makefile staging: olpc_dcon: add config options for XO_1 and XO_1_5, drop hardcoded XO-1 stuff 2011-02-18 12:33:21 -08:00
olpc_dcon.c backlight: add backlight type 2011-03-22 17:43:59 -07:00
olpc_dcon.h staging: olpc_dcon: clean up backlight handling 2011-02-18 12:33:21 -08:00
olpc_dcon_xo_1.c Fix common misspellings 2011-03-31 11:26:23 -03:00
olpc_dcon_xo_1_5.c staging: fix olpc_dcon build errors 2011-04-04 21:37:04 -07:00
TODO drivers/staging/olpc_dcon: convert to new cs5535 gpio API 2011-01-13 08:03:13 -08:00