sugar/linux
1
0
Fork 0
Code Activity
Files
7f95e1880e70bb351b992b01ef70ff083fc00d30
linux/drivers
History
David S. Miller 7e52b33bd5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/ipv6/route.c

This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-15 15:51:55 -07:00
..
accessibility
…
acpi
Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat', 'bugfix-video' and 'workaround-pss' into release
2012-06-04 00:48:41 -04:00
amba
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:22:27 -07:00
ata
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:42:29 -07:00
atm
solos-pci: Fix DMA support
2012-05-24 16:22:53 -04:00
auxdisplay
…
base
regmap: Export regmap_reinit_cache()
2012-06-08 05:57:21 +08:00
bcma
bcma: fix null pointer in bcma_core_pci_irq_ctl
2012-06-08 13:47:07 -04:00
block
mtip32xx: Changes to sysfs entries
2012-05-31 08:46:50 +02:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
cdrom
…
char
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-06-11 16:31:52 +03:00
clk
Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 13:05:55 -07:00
clocksource
clocksource: sh_tmu: Use clockevents_config_and_register().
2012-06-11 17:10:16 +09:00
connector
…
cpufreq
…
cpuidle
…
crypto
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:42:29 -07:00
dca
…
devfreq
Merge tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-05-23 14:07:06 -07:00
dio
…
dma
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:57:47 -07:00
edac
Merge branch 'x86/trampoline' into x86/urgent
2012-05-30 12:11:32 -07:00
eisa
…
extcon
…
firewire
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2012-05-24 12:57:47 -07:00
firmware
…
gpio
gpio/samsung: fix the typo 'exynos5_xxx' instead of 'exonys5_xxx'
2012-06-03 21:21:01 -07:00
gpu
Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-06-14 15:38:48 +03:00
hid
…
hsi
…
hv
…
hwmon
hwmon/sch56xx: Depend on watchdog for watchdog core functions
2012-05-30 07:56:20 +02:00
hwspinlock
…
i2c
i2c: Add generic I2C multiplexer using pinctrl API
2012-06-04 16:49:43 +02:00
ide
…
idle
…
ieee802154
…
iio
…
infiniband
Merge branches 'cxgb4', 'mlx4' and 'ocrdma' into for-linus
2012-06-06 10:08:11 -07:00
input
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
2012-05-30 10:55:34 +02:00
iommu
iommu/amd: Fix deadlock in ppr-handling error path
2012-06-04 12:47:44 +02:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
leds
leds: Make LEDS_ASIC3 and LEDS_RENESAS_TPU depend on LEDS_CLASS=y
2012-06-12 10:56:25 +08:00
lguest
…
macintosh
…
md
Merge tag 'md-3.5-fixes' of git://neil.brown.name/md
2012-06-06 09:49:28 -07:00
media
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:42:29 -07:00
memory
…
memstick
…
message
Merge branch 'akpm' (Andrew's patch-bomb)
2012-05-31 18:10:18 -07:00
mfd
ARM: ux500: Provide regulator support for SMSC911x via Device Tree
2012-06-01 02:04:46 +02:00
misc
Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-05-29 11:53:11 -07:00
mmc
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:57:47 -07:00
mtd
UBI: correct ubi_wl_flush locking
2012-06-07 15:22:21 +03:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-06-15 15:51:55 -07:00
nfc
NFC: Monitor pn533 target mode
2012-06-04 21:34:34 +02:00
nubus
…
of
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-05-29 18:27:19 -07:00
oprofile
…
parisc
…
parport
…
pci
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-05-29 18:27:19 -07:00
pcmcia
…
pinctrl
pinctrl: pinctrl-mxs: set platform driver data to NULL at errpath and at unregister
2012-06-12 16:26:08 +02:00
platform
drivers/platform/x86/acerhdf.c: correct Boris' mail address
2012-06-07 14:43:55 -07:00
pnp
…
power
Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6
2012-05-31 12:10:15 -07:00
pps
…
ps3
…
ptp
…
rapidio
rapidio/tsi721: add DMA engine support
2012-05-31 17:49:31 -07:00
regulator
regulator: core: Properly handle the case min_uV < rdev->desc->min_uV in map_voltage_linear
2012-06-08 07:15:55 +08:00
remoteproc
Merge tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2012-05-30 08:49:28 -07:00
rpmsg
…
rtc
Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat', 'bugfix-video' and 'workaround-pss' into release
2012-06-04 00:48:41 -04:00
s390
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-05-31 10:51:10 -07:00
sbus
…
scsi
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2012-05-31 12:02:41 -07:00
sfi
…
sh
…
sn
…
spi
Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 13:05:55 -07:00
ssb
ssb: add missing PCI ID for b/g/n single band BCM4322
2012-06-11 14:59:44 -04:00
staging
Merge tag 'stable/frontswap.v16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm
2012-06-04 12:28:45 -07:00
target
target/file: Use O_DSYNC by default for FILEIO backends
2012-06-02 23:47:20 -07:00
tc
…
thermal
…
tty
Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh/trivial' into sh-fixes-for-linus
2012-06-13 12:01:33 +09:00
uio
…
usb
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:42:29 -07:00
uwb
…
vhost
…
video
Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux
2012-06-13 17:57:30 +03:00
virt
…
virtio
…
vlynq
…
vme
…
w1
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:42:29 -07:00
watchdog
watchdog: iTCO_wdt.c: fix printk format warnings
2012-05-30 08:16:48 +02:00
xen
Merge tag 'stable/frontswap.v16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm
2012-06-04 12:28:45 -07:00
zorro
…
Kconfig
…
Makefile
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-26 12:22:27 -07:00