kernel-ark/drivers/staging
Linus Torvalds 01539ba2a7 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits)
  omap2: Make OMAP2PLUS select OMAP_DM_TIMER
  OMAP4: hwmod data: Fix alignment and end of line in structurefields
  OMAP4: hwmod data: Move the DMA structures
  OMAP4: hwmod data: Move the smartreflex structures
  OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
  arm: omap: tusb6010: add name for MUSB IRQ
  arm: omap: craneboard: Add USB EHCI support
  omap2+: Initialize serial port for dynamic remuxing for n8x0
  omap2+: Add struct omap_board_data and use it for platform level serial init
  omap2+: Allow hwmod state changes to mux pads based on the state changes
  omap2+: Add support for hwmod specific muxing of devices
  omap2+: Add omap_mux_get_by_name
  OMAP2: PM: fix compile error when !CONFIG_SUSPEND
  MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
  OMAP4: Smartreflex framework extensions
  OMAP4: hwmod: Add inital data for smartreflex modules.
  OMAP4: PM: Program correct init voltages for scalable VDDs
  OMAP4: Adding voltage driver support
  OMAP4: Register voltage PMIC parameters with the voltage layer
  OMAP3: PM: Program correct init voltages for VDD1 and VDD2
  ...

Fix up trivial conflict in arch/arm/plat-omap/Kconfig
2011-01-06 19:13:58 -08:00
..
adis16255
asus_oled Staging: asus_oled: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:18 -08:00
ath6kl Staging: ath6kl: Fix pointer casts on 64-bit architectures 2010-11-09 16:49:02 -08:00
autofs convert get_sb_nodev() users 2010-10-29 04:16:31 -04:00
batman-adv Staging: batman-adv: ensure that eth_type_trans gets linear memory 2010-11-29 10:53:14 -08:00
bcm Staging: bcm: use get_user() to access user pointers 2010-11-09 13:32:36 -08:00
brcm80211 staging: brcm80211: updated maintainers contact information 2010-11-29 10:53:14 -08:00
comedi staging: comedi: fix memory leak 2010-11-16 12:25:52 -08:00
crystalhd Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
cx25821 [media] cx25821: Fix compilation breakage due to BKL dependency 2011-01-05 13:41:40 -02:00
cxt1e1
dabusb [media] dabusb: Move it to staging to be deprecated 2010-12-29 08:17:15 -02:00
dt3155v4l [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
easycap staging: easycap needs smp_lock.h, fixes build error 2010-11-29 10:53:14 -08:00
echo
et131x
frontier Staging: frontier: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:18 -08:00
ft1000 drivers/staging: delete double assignment 2010-11-09 14:05:22 -08:00
go7007 [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
hv SCSI host lock push-down 2010-11-16 13:33:23 -08:00
iio Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:19 -08:00
intel_sst Merge branch 'master' into work 2010-11-29 10:44:22 -08:00
keucr SCSI host lock push-down 2010-11-16 13:33:23 -08:00
line6 Staging: line6: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:20 -08:00
lirc [media] staging/lirc: Update lirc TODO files 2010-12-30 12:17:21 -02:00
memrar
msm staging: Final semaphore cleanup 2010-10-30 12:12:50 +02:00
octeon Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
olpc_dcon i2c: Drivers shouldn't include <linux/i2c-id.h> 2010-11-15 22:40:38 +01:00
panel
phison
pohmelfs convert get_sb_nodev() users 2010-10-29 04:16:31 -04:00
quatech_usb2
quickstart Staging: quickstart: free after input_unregister_device() 2010-11-16 12:25:52 -08:00
rt2860 Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN 2010-11-29 11:48:29 -08:00
rt2870
rtl8187se staging: rtl8187se: Change panic to warn when RF switch turned off 2010-11-16 12:25:53 -08:00
rtl8192e Staging: rtl8192e: fix IOMMU memory leak 2010-11-09 14:05:23 -08:00
rtl8192u
rtl8712 Merge branch 'master' into work 2010-11-29 10:44:22 -08:00
samsung-laptop Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:19 -08:00
sbe-2t3e3
se401 [media] staging: se401 depends on USB 2010-12-30 22:29:41 -02:00
serqt_usb2
slicoss
sm7xx
smbfs Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-10-31 20:40:24 -04:00
solo6x10 Staging: solo6x10: fix build problem 2010-11-02 08:39:05 -07:00
speakup Merge branch 'master' into work 2010-11-29 10:44:22 -08:00
spectra staging: spectra: fix build error 2010-11-17 11:57:43 -08:00
ti-st
tidspbridge OMAP2+: powerdomain: move header file from plat-omap to mach-omap2 2010-12-21 21:05:16 -07:00
tm6000 [media] tm6000: Fix mutex unbalance 2010-12-29 08:17:21 -02:00
usbip Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
usbvideo [media] staging: usbvideo/vicam depends on USB 2010-12-30 22:29:39 -02:00
vme
vt6655 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
vt6656 staging: vt6656: implement missing brackets 2010-11-09 14:05:23 -08:00
westbridge drivers/staging: delete double assignment 2010-11-09 14:05:22 -08:00
winbond staging: fix winbond build, needs delay.h 2010-11-19 10:13:56 -08:00
wlags49_h2 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
wlags49_h25
wlan-ng Staging: wlan-ng: Fix wrong #ifdef #endif sequence 2010-11-09 16:51:42 -08:00
xgifb Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
zram Revert "Staging: zram: work around oops due to startup ordering snafu" 2010-12-30 12:07:22 -08:00
Kconfig Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-01-06 18:32:12 -08:00
Makefile Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-01-06 18:32:12 -08:00
staging.c