linux/drivers/staging
Linus Torvalds b13bc8dda8 Staging tree patches for 3.6-rc1
Here's the big staging tree merge for the 3.6-rc1 merge window.
 
 There are some patches in here outside of drivers/staging/, notibly the iio
 code (which is still stradeling the staging / not staging boundry), the pstore
 code, and the tracing code.  All of these have gotten ackes from the various
 subsystem maintainers to be included in this tree.  The pstore and tracing
 patches are related, and are coming here as they replace one of the android
 staging drivers.
 
 Otherwise, the normal staging mess.  Lots of cleanups and a few new drivers
 (some iio drivers, and the large csr wireless driver abomination.)
 
 Note, you will get a merge issue with the following files:
 	drivers/staging/comedi/drivers/s626.h
 	drivers/staging/gdm72xx/netlink_k.c
 both of which should be trivial for you to handle.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iEYEABECAAYFAlAQiD8ACgkQMUfUDdst+ykxhgCeMUjvc+1RTtSprzvkzpejgoUU
 6A4AnAleWMnkaCD8vruGnRdGl/Qtz51+
 =mN6M
 -----END PGP SIGNATURE-----

Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging tree patches from Greg Kroah-Hartman:
 "Here's the big staging tree merge for the 3.6-rc1 merge window.

  There are some patches in here outside of drivers/staging/, notibly
  the iio code (which is still stradeling the staging / not staging
  boundry), the pstore code, and the tracing code.  All of these have
  gotten acks from the various subsystem maintainers to be included in
  this tree.  The pstore and tracing patches are related, and are coming
  here as they replace one of the android staging drivers.

  Otherwise, the normal staging mess.  Lots of cleanups and a few new
  drivers (some iio drivers, and the large csr wireless driver
  abomination.)

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fixed up trivial conflicts in drivers/staging/comedi/drivers/s626.h and
drivers/staging/gdm72xx/netlink_k.c

* tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1108 commits)
  staging: csr: delete a bunch of unused library functions
  staging: csr: remove csr_utf16.c
  staging: csr: remove csr_pmem.h
  staging: csr: remove CsrPmemAlloc
  staging: csr: remove CsrPmemFree()
  staging: csr: remove CsrMemAllocDma()
  staging: csr: remove CsrMemCalloc()
  staging: csr: remove CsrMemAlloc()
  staging: csr: remove CsrMemFree() and CsrMemFreeDma()
  staging: csr: remove csr_util.h
  staging: csr: remove CsrOffSetOf()
  stating: csr: remove unneeded #includes in csr_util.c
  staging: csr: make CsrUInt16ToHex static
  staging: csr: remove CsrMemCpy()
  staging: csr: remove CsrStrLen()
  staging: csr: remove CsrVsnprintf()
  staging: csr: remove CsrStrDup
  staging: csr: remove CsrStrChr()
  staging: csr: remove CsrStrNCmp
  staging: csr: remove CsrStrCmp
  ...
2012-07-26 11:14:49 -07:00
..
android drivers: staging: android: binder.c: fix printk macros 2012-06-26 15:03:53 -07:00
asus_oled staging: Fixes some checkpatch warnings in asus_oled/asus_oled.c 2012-07-09 12:32:53 -07:00
bcm staging: bcm: Misc.c: Remove unused macros 2012-07-11 17:04:42 -07:00
ccg staging: ccg: print MAC addresses via %pM 2012-07-06 16:24:00 -07:00
comedi Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
cptm1217 staging/cptm1217: fix checkpatch warnings 2012-07-19 16:11:26 -07:00
crystalhd
csr staging: csr: delete a bunch of unused library functions 2012-07-20 17:25:09 -07:00
cxt1e1
echo Staging: echo: One variable per line 2012-07-06 16:08:57 -07:00
et131x staging/et131x: fix checkpatch warnings 2012-07-19 16:01:30 -07:00
frontier staging/frontier: fix checkpatch warnings 2012-07-19 16:11:26 -07:00
ft1000 staging: ft1000-usb: Fix various checkpach warnings in ft1000_usb.h 2012-07-16 19:06:18 -07:00
gdm72xx Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
iio iio staging: fix cast warning and cleanup alignment code 2012-07-15 17:33:18 +01:00
ipack Staging: ipack: change naming convention in TODO file 2012-07-17 10:32:10 -07:00
keucr Staging: keucr: scsiglue: fixed a do while coding style issue 2012-06-13 12:20:16 -07:00
line6 staging: line6: Changed strict_strtoul() to kstrtou8() in pod_set_midi_postprocess() 2012-07-06 16:12:46 -07:00
media i2c: Add SCCB support 2012-07-24 14:13:59 +02:00
net
nvec Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
octeon Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
olpc_dcon
omap-thermal staging: omap-thermal: add OMAP5 data structures 2012-07-16 19:04:16 -07:00
omapdrm Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
ozwpan staging: ozwpan: Update TODO file 2012-06-26 15:07:56 -07:00
panel staging: panel: Use pr_info(...) rather than printk(KERN_INFO 2012-07-16 18:57:26 -07:00
phison staging/phison: use module_pci_driver macro 2012-07-11 17:26:02 -07:00
quickstart
ramster Merge 3.5-rc4 into staging-next 2012-06-25 09:31:00 -07:00
rtl8187se Staging: rtl8187se, rtl8192e: fix '&' vs '|' bugs 2012-06-12 10:52:32 -07:00
rtl8192e Staging: rtl8187se, rtl8192e: fix '&' vs '|' bugs 2012-06-12 10:52:32 -07:00
rtl8192u
rtl8712 Merge 3.5-rc4 into staging-next 2012-06-25 09:31:00 -07:00
rts5139 staging: rts5139: rts51x_card: fixed brace coding style issue 2012-07-17 10:30:59 -07:00
rts_pstor staging/rts_pstor: use kthread_run instead doing kthread_create and wake_up_process 2012-07-16 19:24:46 -07:00
sbe-2t3e3 staging: sbe-2t3e3: Remove code that will never execute 2012-07-19 15:59:58 -07:00
sep staging: sep_crypto.c: remove duplicated include 2012-07-19 17:20:06 -07:00
serqt_usb2 staging: serqt_usb2: Fix some typos. 2012-06-18 17:23:52 -07:00
slicoss staging/slicoss: disable pci device at remove 2012-07-11 17:26:02 -07:00
sm7xxfb staging: sm7xxfb: fix for "rename smtc_screen_info to smtc_scr_info" 2012-07-19 15:36:08 -07:00
speakup staging "speakup" Fix typos. 2012-07-09 13:06:21 -07:00
ste_rmi4 staging: ste_rmi4: Fix typos 2012-07-16 19:24:46 -07:00
telephony staging "telephony" Fix typos. 2012-07-06 16:21:54 -07:00
tidspbridge staging: tidspbridge: dynamically allocate my_sym_buf in dload_symbols 2012-07-06 16:17:01 -07:00
usbip staging: usbip: cleanup and fix of vhci_hub_status 2012-06-13 17:22:57 -07:00
vme vme_user.c: remove duplicated include 2012-07-19 15:39:39 -07:00
vt6655 staging: vt6655: hostap.c: Remove all unused macros 2012-07-09 12:56:31 -07:00
vt6656 staging/vt6656: cleanup coding style in vResetCommandTimer 2012-07-16 19:13:49 -07:00
winbond staging/winbond: use err and remove nr 2012-07-16 19:21:37 -07:00
wlags49_h2 staging: wlags49_h2: remove vi modelines 2012-07-16 19:13:48 -07:00
wlags49_h25
wlan-ng staging/wlan-ng: use kzalloc rather using kmalloc at create_wlan 2012-07-16 19:21:37 -07:00
xgifb Staging: xgifb: Remove useless condition. 2012-07-11 16:59:32 -07:00
zcache staging: zsmalloc: add mapping modes 2012-07-09 11:35:00 -07:00
zram staging: zsmalloc: add mapping modes 2012-07-09 11:35:00 -07:00
zsmalloc staging: zsmalloc: add mapping modes 2012-07-09 11:35:00 -07:00
Kconfig staging: OMAP4+: thermal: introduce bandgap temperature sensor 2012-07-16 19:02:47 -07:00
Makefile staging: OMAP4+: thermal: introduce bandgap temperature sensor 2012-07-16 19:02:47 -07:00
staging.c