diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 15:27:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 15:27:59 -0700 |
| commit | a094c0afc3515aaf962dd0793f3b23fe67e6b192 (patch) | |
| tree | 42ab38786a6cadc034e8475a7a231a902e6e6c51 | |
| parent | f9196e7c03bfefbb8933c7af579c3c6caa72ea53 (diff) | |
| parent | 640f7dcfe047aa5859df5f5d41e7f6455a442b89 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (27 commits)
Staging: sep: return -EFAULT on copy_to_user errors
Staging: rc2860: return -EFAULT on copy_to_user errors
Staging: Eliminate a NULL pointer dereference
staging: Use GFP_ATOMIC when a lock is held
Staging: comedi - correct parameter gainlkup for DAQCard-6024E in driver ni_mio_cs.c
Staging: comedi: fixing ni_labpc to mite dependancy
Staging: wlags49_h2, wlags49_h25: fixed Kconfig dependencies
Staging: phison: depends on ATA_BMDMA
Staging: iio-utils: fix memory overflow for dynamically allocateded memory to hold filename
Staging: adis16255: add proper section markings to hotplug funcs
Staging: adis16255: fix typo in Kconfig
Staging: batman-adv: Don't allocate icmp packet with GFP_KERNEL
Staging: batman-adv: Don't call free_netdev twice
Staging: batman-adv: Call unregister_netdev on failures to get rtnl lock
Staging: batman-adv: fix rogue packets on shutdown
Staging: add MSM framebuffer driver
Staging: comedi: fixing ni_tio to mite PCI dependancy
Staging: comedi: fix 8255 and DAS08 Kconfig dependancies.
Staging: comedi: For COMEDI_BUFINFO, check access to command
Staging: comedi: COMEDI_BUFINFO with no async - report no bytes read or written
...