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-11 08:18:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-next/drivers
History
Randy Dunlap 2550326ac7 backlight: fix 88pm860x_bl macro collision 
Fix collision with kernel-supplied #define:

  drivers/video/backlight/88pm860x_bl.c:24:1: warning: "CURRENT_MASK" redefined
  arch/x86/include/asm/page_64_types.h:6:1: warning: this is the location of the previous definition

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 17:02:06 -08:00
..
accessibility
…
acpi
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
amba
…
ata
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
atm
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
auxdisplay
…
base
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
block
Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:50:24 -08:00
bluetooth
…
cdrom
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
char
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
clk
…
clocksource
clocksource: sh_cmt: Remove nested spinlock fix
2010-12-17 19:38:33 +09:00
connector
connector: Use this_cpu operations
2010-12-17 15:18:05 +01:00
cpufreq
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
cpuidle
Merge branch 'cpuidle-perf-events' into idle-test
2011-01-12 18:06:19 -05:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
dca
dca: remove unneeded NULL check
2011-01-13 08:03:09 -08:00
dio
…
dma
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2011-01-17 10:54:41 -08:00
edac
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
eisa
…
firewire
firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO
2011-01-13 15:48:29 +01:00
firmware
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
gpio
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2011-01-14 09:08:00 -08:00
gpu
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
hid
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
hwmon
hwmon: (lm93) Add support for LM94
2011-01-18 12:22:54 -08:00
i2c
i2c: Encourage move to dev_pm_ops by warning on use of legacy methods
2011-01-14 22:03:50 +01:00
ide
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
idle
Merge branch 'cpuidle-perf-events' into idle-test
2011-01-12 18:06:19 -05:00
ieee802154
…
infiniband
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
input
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
isdn
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
leds
drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking
2011-01-20 17:02:06 -08:00
lguest
…
macintosh
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
mca
…
md
block: restore multiple bd_link_disk_holder() support
2011-01-14 18:44:22 +01:00
media
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
memstick
memstick: factor out transfer initiating functionality in mspro_block.c
2011-01-13 08:03:22 -08:00
message
Merge branch 'master' into for-next
2010-12-22 18:57:02 +01:00
mfd
mfd: ab8500-core chip version cut 2.0 support
2011-01-14 12:38:18 +01:00
misc
misc: Make AB8500_PWM driver depend on U8500 due to PWM breakage
2011-01-14 12:38:12 +01:00
mmc
mmc: sdhci-of: fix build on non-powerpc platforms
2011-01-14 00:22:44 -07:00
mtd
Merge git://git.infradead.org/mtd-2.6
2011-01-17 11:15:30 -08:00
net
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
nfc
drivers/nfc/pn544.c: fix min_t warnings
2011-01-16 17:28:21 -08:00
nubus
…
of
dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
2011-01-15 22:01:58 -07:00
oprofile
…
parisc
…
parport
…
pci
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
pcmcia
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
platform
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2011-01-13 20:15:35 -08:00
pnp
Merge branch 'pnp' into release
2011-01-12 04:59:44 -05:00
power
Merge git://git.infradead.org/battery-2.6
2011-01-14 09:25:59 -08:00
pps
pps: add parallel port PPS signal generator
2011-01-13 08:03:21 -08:00
ps3
…
rapidio
rapidio: add new idt sRIO switches
2011-01-13 08:03:18 -08:00
regulator
regulator: Support MAX8998/LP3974 DVS-GPIO
2011-01-14 12:38:16 +01:00
rtc
mfd: Support LP3974 RTC
2011-01-14 12:38:16 +01:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-01-19 20:25:45 -08:00
sbus
sparc: explicitly cast negative phandle checks to s32
2011-01-03 20:02:06 -07:00
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6
2011-01-14 16:29:49 -08:00
serial
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
sfi
SFI: use ioremap_cache() instead of ioremap()
2011-01-11 23:27:25 -05:00
sh
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
sn
…
spi
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
2011-01-18 14:28:48 -08:00
ssb
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
staging
staging: fix build failure in bcm driver
2011-01-17 17:39:39 -08:00
target
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
tc
…
telephony
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
thermal
Merge branch 'misc' into release
2011-01-12 05:14:15 -05:00
tty
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-01-07 14:39:20 -08:00
uio
…
usb
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
uwb
Merge branch 'usb-next' into musb-merge
2010-12-16 10:05:06 -08:00
vhost
vhost: fix signed/unsigned comparison
2011-01-10 10:03:39 +02:00
video
backlight: fix 88pm860x_bl macro collision
2011-01-20 17:02:06 -08:00
virtio
…
vlynq
…
w1
w1: DS2423 counter driver and documentation
2011-01-13 08:03:22 -08:00
watchdog
watchdog: Add MCF548x watchdog driver.
2011-01-12 13:51:35 +00:00
xen
Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-01-13 18:46:48 -08:00
zorro
…
Kconfig
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
Makefile
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00