kevin/linux
1
Fork 0
Code
4964e0664c
linux/drivers/staging
History
Linus Torvalds 4964e0664c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
  MIPS: Delete unused function add_temporary_entry.
  MIPS: Set default pci cache line size.
  MIPS: Flush huge TLB
  MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
  MIPS: Octeon: Add support for OCTEON II PCIe
  MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
  MIPS: Alchemy: Update cpu-feature-overrides
  MIPS: Alchemy: db1200: Improve PB1200 detection.
  MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
  MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
  MIPS: Alchemy: irq: register pm at irq init time
  MIPS: Alchemy: Touchscreen support on DB1100
  MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
  net/irda: convert au1k_ir to platform driver.
  MIPS: Alchemy: remove unused board headers
  MTD: nand: make au1550nd.c a platform_driver
  MIPS: Netlogic: Mark Netlogic chips as SMT capable
  MIPS: Netlogic: Add support for XLP 3XX cores
  MIPS: Netlogic: Merge some of XLR/XLP wakup code
  MIPS: Netlogic: Add default XLP config.
  ...

Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile
2012-01-14 13:05:21 -08:00
..
android Staging: android: fixed 80 characters warnings in lowmemorykiller.c 2011-12-22 13:33:57 -08:00
asus_oled
bcm Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
comedi module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
cptm1217
crystalhd staging: crystalhd: bc_dts_defs.h: Fix up coding style 2011-12-16 10:54:15 -08:00
cxt1e1 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
echo
et131x staging: et131x: Revert changes from previous commit 2011-12-08 15:03:11 -08:00
frontier Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
ft1000 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
gma500 Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux 2012-01-10 11:04:36 -08:00
hv Staging: hv: storvsc: Fix a bug in create_bounce_buffer() 2011-12-08 14:59:47 -08:00
iio Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
keucr Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
line6 staging: line6: fixed ALSA/PCM interaction 2011-12-09 19:26:09 -08:00
media module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
mei staging/mei: add watchdog device registration wrappers 2011-12-22 13:46:16 -08:00
nvec
octeon MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
olpc_dcon Staging: olpc_dcon.c: obsolete use of strict_stroul 2011-12-08 15:01:49 -08:00
omapdrm drm/omap: GEM, deal with cache 2011-12-22 13:46:15 -08:00
panel
phison
pohmelfs vfs: switch ->show_options() to struct dentry * 2012-01-06 23:19:54 -05:00
quatech_usb2 module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
quickstart
rtl8187se
rtl8192e staging/rtl8192e: Register against lib80211 2011-12-22 13:48:59 -08:00
rtl8192u
rtl8712 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
rts5139 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
rts_pstor Merge branch 'master' into pm-sleep 2011-12-21 21:59:45 +01:00
sbe-2t3e3
sep Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
serial
serqt_usb2 module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
slicoss
sm7xx
speakup module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
ste_rmi4
tidspbridge Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
usbip staging: usbip: removed unused definitions from header 2011-12-22 13:40:03 -08:00
vme module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
vt6655
vt6656 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
winbond
wlags49_h2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
wlags49_h25
wlan-ng
xgifb staging: xgifb: enable forcecrt2type as a module parameter 2011-12-08 12:26:09 -08:00
zcache
zram Staging: zram: Add a missing GFP_KERNEL specifier in zram_init_device() 2011-12-08 14:59:48 -08:00
Kconfig Staging: lttng: remove from the drivers/staging/ tree 2011-12-08 15:25:56 -08:00
Makefile Staging: lttng: remove from the drivers/staging/ tree 2011-12-08 15:25:56 -08:00
staging.c