leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
9da3da660d8c19a54f6e93361d147509be3fff84
linux/drivers/staging
History
Dave Airlie 93bb70e0c0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next 
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_modes.c
2012-08-27 16:22:20 +10: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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
ccg
staging: ccg: print MAC addresses via %pM
2012-07-06 16:24:00 -07:00
comedi
staging: comedi: usbduxfast: Declare MODULE_FIRMWARE usage
2012-08-16 11:28:36 -07:00
cptm1217
staging/cptm1217: fix checkpatch warnings
2012-07-19 16:11:26 -07:00
crystalhd
…
csr
staging: csr: add INET dependancy
2012-08-14 16:53:21 -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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
iio
staging:iio:ad7780: Mark channels as unsigned
2012-08-16 20:24:37 +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
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-31 18:47:44 -07:00
net
…
nvec
Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2012-07-26 11:14:49 -07:00
octeon
staging: octeon_ethernet: Convert to use device tree.
2012-07-23 13:54:53 +01:00
olpc_dcon
drivers: OLPC: update various drivers to include olpc-ec.h
2012-07-31 23:27:29 -04:00
omap-thermal
staging: omap-thermal: add OMAP5 data structures
2012-07-16 19:04:16 -07:00
omapdrm
drm: remove the raw_edid field from struct drm_display_info
2012-08-24 09:37:36 +10: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
USB: vt6656: remove __devinit* from the struct usb_device_id table
2012-08-17 17:50:45 -07:00
winbond
USB: winbond: remove __devinit* from the struct usb_device_id table
2012-08-17 17:50:45 -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
…