1
0
Fork 0
alistair23-linux/drivers
Linus Torvalds 56847d857c Merge branch 'akpm' (incoming from Andrew)
Merge second batch of fixes from Andrew Morton:

 - various misc bits

 - some printk updates

 - a new "SRAM" driver.

 - MAINTAINERS updates

 - the backlight driver queue

 - checkpatch updates

 - a few init/ changes

 - a huge number of drivers/rtc changes

 - fatfs updates

 - some lib/idr.c work

 - some renaming of the random driver interfaces

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (285 commits)
  net: rename random32 to prandom
  net/core: remove duplicate statements by do-while loop
  net/core: rename random32() to prandom_u32()
  net/netfilter: rename random32() to prandom_u32()
  net/sched: rename random32() to prandom_u32()
  net/sunrpc: rename random32() to prandom_u32()
  scsi: rename random32() to prandom_u32()
  lguest: rename random32() to prandom_u32()
  uwb: rename random32() to prandom_u32()
  video/uvesafb: rename random32() to prandom_u32()
  mmc: rename random32() to prandom_u32()
  drbd: rename random32() to prandom_u32()
  kernel/: rename random32() to prandom_u32()
  mm/: rename random32() to prandom_u32()
  lib/: rename random32() to prandom_u32()
  x86: rename random32() to prandom_u32()
  x86: pageattr-test: remove srandom32 call
  uuid: use prandom_bytes()
  raid6test: use prandom_bytes()
  sctp: convert sctp_assoc_set_id() to use idr_alloc_cyclic()
  ...
2013-04-29 19:47:50 -07:00
..
accessibility
acpi PCI changes for the v3.10 merge window: 2013-04-29 09:30:25 -07:00
amba
ata Char / Misc driver update for 3.10-rc1 2013-04-29 11:18:34 -07:00
atm
auxdisplay
base Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2013-04-29 19:07:40 -07:00
bcma
block drbd: rename random32() to prandom_u32() 2013-04-29 18:28:42 -07:00
bluetooth Merge v3.9-rc5 into char-misc-next 2013-04-01 10:50:58 -07:00
bus
cdrom
char Char / Misc driver update for 3.10-rc1 2013-04-29 11:18:34 -07:00
clk The common clock framework changes for 3.10 include many fixes for 2013-04-29 16:43:54 -07:00
clocksource clk: arm: sunxi: Add a new clock driver for sunxi SOCs 2013-03-27 08:35:34 -07:00
connector
cpufreq cpufreq / intel_pstate: Set timer timeout correctly 2013-04-08 22:09:23 +02:00
cpuidle
crypto crypto: ux500 - add missing comma 2013-04-05 21:02:17 +08:00
dca
devfreq
dio
dma dmaengine: at_hdmac: fix race condition in atc_advance_work() 2013-04-18 08:54:22 -07:00
edac
eisa PCI changes for the v3.10 merge window: 2013-04-29 09:30:25 -07:00
extcon This is small fixes for extcon driver. 2013-04-08 16:50:23 -07:00
firewire
firmware firmware, memmap: fix firmware_map_entry leak 2013-04-29 15:54:38 -07:00
gpio These are the pinctrl changes for v3.10: 2013-04-29 09:40:35 -07:00
gpu Merge branch '3.10/fb-mmap' into for-next 2013-04-26 09:14:47 +03:00
hid Merge 3.9-rc6 into usb-next 2013-04-08 08:36:40 -07:00
hsi
hv Drivers: hv: vmbus: Fix a bug in hv_need_to_signal() 2013-04-01 12:29:52 -07:00
hwmon Staging driver tree update for 3.10-rc1 2013-04-29 11:34:17 -07:00
hwspinlock hwspinlock: fix __hwspin_lock_request error path 2013-04-05 17:45:11 +03:00
i2c ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices() 2013-04-02 15:30:41 +02:00
ide
idle
iio iio: at91_adc: fix missing Sample and Hold time 2013-04-02 19:22:16 +01:00
infiniband drivers/infiniband/hw/mlx4: convert to using idr_alloc_cyclic() 2013-04-29 18:28:41 -07:00
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2013-04-19 09:15:13 -07:00
iommu PCI changes for the v3.10 merge window: 2013-04-29 09:30:25 -07:00
ipack
irqchip irqchip: gic: fix irq_trigger return 2013-03-26 20:52:25 +01:00
isdn TTY/Serial driver update for 3.10-rc1 2013-04-29 12:16:17 -07:00
leds
lguest lguest: rename random32() to prandom_u32() 2013-04-29 18:28:43 -07:00
macintosh
mailbox
md Revert "block: add missing block_bio_complete() tracepoint" 2013-04-18 09:00:26 -07:00
media media: coda: use genalloc API 2013-04-29 18:28:13 -07:00
memory memory: emif: Load the correct custom config values from dt 2013-03-25 13:18:13 -07:00
memstick
message
mfd regulator: Updates for v3.10 2013-04-29 16:32:25 -07:00
misc misc: generic on-chip SRAM allocation driver 2013-04-29 18:28:13 -07:00
mmc mmc: rename random32() to prandom_u32() 2013-04-29 18:28:42 -07:00
mtd mtdchar: remove no-longer-used vma helpers 2013-04-19 10:05:39 -07:00
net USB patches for 3.10-rc1 2013-04-29 12:19:23 -07:00
nfc NFC: microread: Fix build failure due to a new MEI bus API 2013-04-01 00:52:42 +02:00
ntb
nubus
of
oprofile
parisc
parport parport: use kmemdup instead of kmalloc + memcpy 2013-03-25 10:42:06 -07:00
pci PCI changes for the v3.10 merge window: 2013-04-29 09:30:25 -07:00
pcmcia
pinctrl pinctrl: move subsystem mutex to pinctrl_dev struct 2013-04-26 17:01:35 +02:00
platform Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 2013-04-18 15:14:34 -07:00
pnp
power
pps
ps3
ptp
pwm
rapidio
regulator Merge remote-tracking branch 'regulator/topic/wm8994' into v3.9-rc8 2013-04-28 02:13:50 +01:00
remoteproc remoteproc: fix FW_CONFIG typo 2013-04-07 15:11:27 +03:00
rpmsg drivers/rpmsg/virtio_rpmsg_bus.c: fix error return code in rpmsg_probe() 2013-04-29 18:28:13 -07:00
rtc drivers/rtc/rtc-pcf2123.c: fix error return code in pcf2123_probe() 2013-04-29 18:28:40 -07:00
s390 TTY/Serial driver update for 3.10-rc1 2013-04-29 12:16:17 -07:00
sbus bbc_i2c: fix section mismatch warning 2013-03-31 19:29:12 -04:00
scsi scsi: rename random32() to prandom_u32() 2013-04-29 18:28:43 -07:00
sfi
sh
sn
spi spi: Updates for v3.10 2013-04-29 16:38:41 -07:00
ssb ssb: implement spurious tone avoidance 2013-04-10 10:31:26 -04:00
ssbi SSBI: Remove MSM_ prefix from SSBI drivers 2013-03-25 10:39:40 -07:00
staging TTY/Serial driver update for 3.10-rc1 2013-04-29 12:16:17 -07:00
target target: Fix incorrect fallthrough of ALUA Standby/Offline/Transition CDBs 2013-04-11 01:48:49 -07:00
tc
thermal
tty TTY/Serial driver update for 3.10-rc1 2013-04-29 12:16:17 -07:00
uio drivers: uio: Fix UIO device registration failure 2013-03-29 09:08:22 -07:00
usb USB patches for 3.10-rc1 2013-04-29 12:19:23 -07:00
uwb uwb: rename random32() to prandom_u32() 2013-04-29 18:28:43 -07:00
vfio PCI changes for the v3.10 merge window: 2013-04-29 09:30:25 -07:00
vhost Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 2013-04-12 15:26:42 -07:00
video video/uvesafb: rename random32() to prandom_u32() 2013-04-29 18:28:43 -07:00
virt
virtio
vlynq
vme
w1 ASoC/extcon: arizona: Fix interaction between HPDET and headphone outputs 2013-03-26 09:19:02 -07:00
watchdog watchdog: Revert the AT91RM9200_WATCHDOG dependency 2013-04-14 09:09:10 +02:00
xen Features: 2013-04-29 08:16:51 -07:00
zorro
Kconfig
Makefile USB patches for 3.10-rc1 2013-04-29 12:19:23 -07:00