Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-next/drivers
History
Fengguang Wu bac7169660 firmware/memmap: avoid type conflicts with the generic memmap_init() 
Fix this build error:

  drivers/firmware/memmap.c:240:19: error: conflicting types for 'memmap_init'
  arch/ia64/include/asm/pgtable.h:565:17: note: previous declaration of 'memmap_init' was here

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Bernhard Walle <bwalle@suse.de>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-10-19 14:07:47 -07:00
..
accessibility
…
acpi
ACPI: Reorder IPMI driver before any other ACPI drivers
2012-10-16 18:07:12 -07:00
amba
…
ata
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
atm
sections: fix section conflicts in drivers/atm
2012-10-06 03:04:40 +09:00
auxdisplay
…
base
memory-hotplug: update memory block's state and notify userspace
2012-10-09 16:23:02 +09:00
bcma
Merge commit '371a00448f95adaa612cf1a0b31a11e7093bc706' of 'git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git'
2012-09-29 15:37:49 +01:00
block
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
bus
drivers: bus: omap_l3: fixup merge conflict resolution
2012-10-01 19:39:48 -07:00
cdrom
…
char
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
2012-10-16 18:14:31 -07:00
clk
spi: Updates for v3.7
2012-10-02 17:26:42 -07:00
clocksource
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
connector
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
cpufreq
cpufreq: OMAP: use get_cpu_device() instead of omap_device API
2012-10-08 14:58:56 -07:00
cpuidle
ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
2012-10-08 22:52:54 -04:00
crypto
ARM: soc: late platform updates
2012-10-07 20:55:16 +09:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
edac
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
eisa
…
extcon
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
firewire
firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
2012-10-09 18:26:28 +02:00
firmware
firmware/memmap: avoid type conflicts with the generic memmap_init()
2012-10-19 14:07:47 -07:00
gpio
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-10-09 16:08:04 +09:00
gpu
nouveau: fix warning on 32-bit build.
2012-10-16 16:40:53 +10:00
hid
Merge branch 'next' into for-linus
2012-10-11 00:45:21 -07:00
hsi
…
hv
…
hwmon
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
hwspinlock
…
i2c
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-10-11 10:27:51 +09:00
ide
sections: fix section conflicts in drivers/ide
2012-10-06 03:04:41 +09:00
idle
intel_idle: enable IVB Xeon support
2012-09-26 22:28:21 -04:00
iio
iio: adc: add new lp8788 adc driver
2012-09-22 10:29:19 +01:00
infiniband
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-13 10:56:03 +09:00
iommu
IOMMU Updates for Linux v3.7-rc1
2012-10-08 06:33:44 +09:00
irqchip
irqchip: fill in empty Kconfig
2012-09-24 10:07:40 -07:00
isdn
isdn: fix a wrapping bug in isdn_ppp_ioctl()
2012-10-10 22:50:45 -04:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-10-10 20:14:07 +09:00
lguest
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
md
md updates for 3.7
2012-10-13 13:22:01 -07:00
media
[media] Kconfig: Fix dependencies for driver autoselect options
2012-10-17 16:45:56 -03:00
memory
memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
2012-09-26 14:04:09 -07:00
memstick
…
message
[SCSI] Fusion MPT: disable pci device when mpt map resoures failed
2012-09-14 17:59:29 +01:00
mfd
1. New drivers:
2012-10-07 17:29:24 +09:00
misc
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
mmc
mmc: mxs-mmc: Fix merge issue causing build error
2012-10-11 17:21:40 -04:00
mtd
mtd: Disable mtdchar mmap on MMU systems
2012-10-09 15:08:42 +01:00
net
bnx2x: fix handling mf storage modes
2012-10-16 14:41:47 -04:00
nfc
NFC: Fix missing mutex unlock in pn533_send_cmd_frame_async
2012-09-27 10:47:48 +02:00
nubus
…
of
of/platform: sparse fix
2012-10-17 15:53:03 -05:00
oprofile
mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
2012-10-09 16:22:18 +09:00
parisc
…
parport
Xtensa patchset for 3.7
2012-10-09 16:11:46 +09:00
pci
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
pcmcia
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
pinctrl
pinctrl/nomadik: always use the simple irqdomain
2012-10-15 09:09:27 +02:00
platform
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release
2012-10-09 01:47:35 -04:00
pnp
ACPI: Allow ACPI binding with USB-3.0 hub
2012-09-21 13:30:29 -04:00
power
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
pps
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
ps3
…
ptp
ptp: link the phc device to its parent device
2012-09-22 15:42:38 -04:00
pwm
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
rapidio
rapidio: update for destination ID allocation
2012-10-11 08:50:15 +09:00
regulator
MFD bits for the 3.7 merge window.
2012-10-05 12:01:30 +09:00
remoteproc
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
rpmsg
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
rtc
rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS
2012-10-11 08:50:16 +09:00
s390
qeth: fix deadlock between recovery and bonding driver
2012-10-16 14:41:46 -04:00
sbus
drivers/sbus/char: removes unnecessary semicolon
2012-09-21 12:08:56 -07:00
scsi
SCSI misc on 20121012
2012-10-13 10:57:01 +09:00
sfi
…
sh
sh: Fix up more fallout from pointless ARM __iomem churn.
2012-10-15 14:08:48 +09:00
sn
…
spi
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
ssb
…
staging
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
target
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
tc
…
thermal
thermal, cpufreq: Fix build when CPU_FREQ_TABLE isn't configured
2012-10-15 14:00:07 -07:00
tty
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2012-10-17 12:40:44 -07:00
uio
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
usb
Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
2012-10-11 15:18:49 -04:00
uwb
…
vfio
vfio: Fix PCI INTx disable consistency
2012-10-10 09:10:32 -06:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
video
drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths
2012-10-19 14:07:47 -07:00
virt
…
virtio
virtio_mmio: Don't attempt to create empty virtqueues
2012-09-28 15:05:16 +09:30
vlynq
…
vme
…
w1
char/misc driver merge for 3.7-rc1
2012-10-01 12:09:59 -07:00
watchdog
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2012-10-07 21:06:10 +09:00
xen
Feature:
2012-10-12 22:20:28 +09:00
zorro
…
Kconfig
ARM: soc: driver specific changes
2012-10-01 18:46:13 -07:00
Makefile
IPMI: Change link order
2012-10-16 18:07:12 -07:00