mirror of
https://github.com/torvalds/linux.git
synced 2024-11-13 23:51:39 +00:00
fb09bafda6
Here is the big staging tree pull request for the 3.5-rc1 merge window. Loads of changes here, and we just narrowly added more lines than we added: 622 files changed, 28356 insertions(+), 26059 deletions(-) But, good news is that there is a number of subsystems that moved out of the staging tree, to their respective "real" portions of the kernel. Code that moved out was: - iio core code - mei driver - vme core and bridge drivers There was one broken network driver that moved into staging as a step before it is removed from the tree (pc300), and there was a few new drivers added to the tree: - new iio drivers - gdm72xx wimax USB driver - ipack subsystem and 2 drivers All of the movements around have acks from the various subsystem maintainers, and all of this has been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk+7q8MACgkQMUfUDdst+ymjogCguo8fANFVlPWeZGeoBTL+aQfQ yTkAoLE0codmh+2SvhulYgyU1Wh6ZDK2 =nJ2F -----END PGP SIGNATURE----- Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging tree changes from Greg Kroah-Hartman: "Here is the big staging tree pull request for the 3.5-rc1 merge window. Loads of changes here, and we just narrowly added more lines than we added: 622 files changed, 28356 insertions(+), 26059 deletions(-) But, good news is that there is a number of subsystems that moved out of the staging tree, to their respective "real" portions of the kernel. Code that moved out was: - iio core code - mei driver - vme core and bridge drivers There was one broken network driver that moved into staging as a step before it is removed from the tree (pc300), and there was a few new drivers added to the tree: - new iio drivers - gdm72xx wimax USB driver - ipack subsystem and 2 drivers All of the movements around have acks from the various subsystem maintainers, and all of this has been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up various trivial conflicts, along with a non-trivial one found in -next and pointed out by Olof Johanssen: a clean - but incorrect - merge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually as per Stephen Rothwell. * tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits) Staging: bcm: Remove two unused variables from Adapter.h Staging: bcm: Removes the volatile type definition from Adapter.h Staging: bcm: Rename all "INT" to "int" in Adapter.h Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h Staging: bcm: Correctly format all comments in Adapter.h Staging: bcm: Fix all whitespace issues in Adapter.h Staging: bcm: Properly format braces in Adapter.h Staging: ipack/bridges/tpci200: remove unneeded casts Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant Staging: ipack: remove board_name and bus_name fields from struct ipack_device Staging: ipack: improve the register of a bus and a device in the bus. staging: comedi: cleanup all the comedi_driver 'detach' functions staging: comedi: remove all 'default N' in Kconfig staging: line6/config.h: Delete unused header staging: gdm72xx depends on NET staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices staging: drm/omap: initial dmabuf/prime import support staging: drm/omap: dmabuf/prime mmap support pstore/ram: Add ECC support pstore/ram: Switch to persistent_ram routines ...
152 lines
2.4 KiB
Plaintext
152 lines
2.4 KiB
Plaintext
menu "Device Drivers"
|
|
|
|
source "drivers/base/Kconfig"
|
|
|
|
source "drivers/connector/Kconfig"
|
|
|
|
source "drivers/mtd/Kconfig"
|
|
|
|
source "drivers/of/Kconfig"
|
|
|
|
source "drivers/parport/Kconfig"
|
|
|
|
source "drivers/pnp/Kconfig"
|
|
|
|
source "drivers/block/Kconfig"
|
|
|
|
# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
|
|
|
|
source "drivers/misc/Kconfig"
|
|
|
|
source "drivers/ide/Kconfig"
|
|
|
|
source "drivers/scsi/Kconfig"
|
|
|
|
source "drivers/ata/Kconfig"
|
|
|
|
source "drivers/md/Kconfig"
|
|
|
|
source "drivers/target/Kconfig"
|
|
|
|
source "drivers/message/fusion/Kconfig"
|
|
|
|
source "drivers/firewire/Kconfig"
|
|
|
|
source "drivers/message/i2o/Kconfig"
|
|
|
|
source "drivers/macintosh/Kconfig"
|
|
|
|
source "drivers/net/Kconfig"
|
|
|
|
source "drivers/isdn/Kconfig"
|
|
|
|
# input before char - char/joystick depends on it. As does USB.
|
|
|
|
source "drivers/input/Kconfig"
|
|
|
|
source "drivers/char/Kconfig"
|
|
|
|
source "drivers/i2c/Kconfig"
|
|
|
|
source "drivers/spi/Kconfig"
|
|
|
|
source "drivers/hsi/Kconfig"
|
|
|
|
source "drivers/pps/Kconfig"
|
|
|
|
source "drivers/ptp/Kconfig"
|
|
|
|
source "drivers/pinctrl/Kconfig"
|
|
|
|
source "drivers/gpio/Kconfig"
|
|
|
|
source "drivers/w1/Kconfig"
|
|
|
|
source "drivers/power/Kconfig"
|
|
|
|
source "drivers/hwmon/Kconfig"
|
|
|
|
source "drivers/thermal/Kconfig"
|
|
|
|
source "drivers/watchdog/Kconfig"
|
|
|
|
source "drivers/ssb/Kconfig"
|
|
|
|
source "drivers/bcma/Kconfig"
|
|
|
|
source "drivers/mfd/Kconfig"
|
|
|
|
source "drivers/regulator/Kconfig"
|
|
|
|
source "drivers/media/Kconfig"
|
|
|
|
source "drivers/video/Kconfig"
|
|
|
|
source "sound/Kconfig"
|
|
|
|
source "drivers/hid/Kconfig"
|
|
|
|
source "drivers/usb/Kconfig"
|
|
|
|
source "drivers/uwb/Kconfig"
|
|
|
|
source "drivers/mmc/Kconfig"
|
|
|
|
source "drivers/memstick/Kconfig"
|
|
|
|
source "drivers/leds/Kconfig"
|
|
|
|
source "drivers/accessibility/Kconfig"
|
|
|
|
source "drivers/infiniband/Kconfig"
|
|
|
|
source "drivers/edac/Kconfig"
|
|
|
|
source "drivers/rtc/Kconfig"
|
|
|
|
source "drivers/dma/Kconfig"
|
|
|
|
source "drivers/dca/Kconfig"
|
|
|
|
source "drivers/auxdisplay/Kconfig"
|
|
|
|
source "drivers/uio/Kconfig"
|
|
|
|
source "drivers/vlynq/Kconfig"
|
|
|
|
source "drivers/virtio/Kconfig"
|
|
|
|
source "drivers/hv/Kconfig"
|
|
|
|
source "drivers/xen/Kconfig"
|
|
|
|
source "drivers/staging/Kconfig"
|
|
|
|
source "drivers/platform/Kconfig"
|
|
|
|
source "drivers/clk/Kconfig"
|
|
|
|
source "drivers/hwspinlock/Kconfig"
|
|
|
|
source "drivers/clocksource/Kconfig"
|
|
|
|
source "drivers/iommu/Kconfig"
|
|
|
|
source "drivers/remoteproc/Kconfig"
|
|
|
|
source "drivers/rpmsg/Kconfig"
|
|
|
|
source "drivers/virt/Kconfig"
|
|
|
|
source "drivers/devfreq/Kconfig"
|
|
|
|
source "drivers/extcon/Kconfig"
|
|
|
|
source "drivers/memory/Kconfig"
|
|
|
|
source "drivers/iio/Kconfig"
|
|
|
|
source "drivers/vme/Kconfig"
|
|
|
|
endmenu
|