tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
482a9c74fa17c5d584995c19e1a36eaf710d1193
ack-tegra/drivers
History
Johannes Berg 51217cee3a Merge remote-tracking branch 'wireless-next/master' into HEAD 
Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2013-06-04 13:02:42 +02:00
..
accessibility
…
acpi
Merge tag 'acpi-fixes-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2013-05-09 16:33:42 -07:00
amba
…
ata
Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-07 11:22:14 -07:00
atm
atm: he: use mdelay instead of large udelay constants
2013-04-29 13:26:48 -04:00
auxdisplay
…
base
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-05-01 13:20:04 -07:00
bcma
bcma: support SPROM rev 10
2013-05-22 15:08:44 -04:00
block
Merge git://git.infradead.org/users/willy/linux-nvme
2013-05-09 16:35:00 -07:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
bus
…
cdrom
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
char
aio: don't include aio.h in sched.h
2013-05-07 20:16:25 -07:00
clk
Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-07 11:28:42 -07:00
clocksource
Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-07 11:28:42 -07:00
connector
…
cpufreq
Merge branch 'pm-cpufreq'
2013-04-29 00:08:46 +02:00
cpuidle
…
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-05-02 14:53:12 -07:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2013-05-09 09:46:45 -07:00
edac
Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2013-05-09 10:11:08 -07:00
eisa
Merge tag 'pci-v3.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2013-04-29 09:30:25 -07:00
extcon
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
firewire
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2013-05-09 10:11:48 -07:00
firmware
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
gpio
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-05-02 19:40:34 -07:00
hid
HID: debug: fix RCU preemption issue
2013-05-06 13:07:33 +02:00
hsi
…
hv
Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-04-30 08:41:21 -07:00
hwmon
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2013-05-04 13:44:38 -07:00
hwspinlock
Merge tag 'hwspinlock-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
2013-05-07 14:01:27 -07:00
i2c
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
ide
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
idle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2013-05-11 15:23:17 -07:00
iio
…
infiniband
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2013-05-08 15:29:48 -07:00
input
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
iommu
Merge tag 'iommu-updates-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2013-05-06 14:59:13 -07:00
ipack
…
irqchip
Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-07 11:28:42 -07:00
isdn
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
leds
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
lguest
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-05-02 14:14:04 -07:00
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
mailbox
…
md
dm cache: set config value
2013-05-10 14:37:21 +01:00
media
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-05-02 14:38:53 -07:00
memory
…
memstick
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
message
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
mfd
Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next
2013-05-05 17:36:20 -07:00
misc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
mmc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-07 15:14:53 -07:00
mtd
Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd
2013-05-09 10:15:46 -07:00
net
Merge remote-tracking branch 'wireless-next/master' into HEAD
2013-06-04 13:02:42 +02:00
nfc
…
ntb
…
nubus
nubus: Kill nubus_proc_detach_device()
2013-05-04 14:47:26 -04:00
of
net: of_mdio: fix behavior on missing phy device
2013-05-08 13:13:29 -07:00
oprofile
…
parisc
parisc: fix partly 16/64k PAGE_SIZE boot
2013-05-06 23:08:32 +02:00
parport
…
pci
Merge tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2013-05-09 10:21:44 -07:00
pcmcia
…
pinctrl
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
platform
Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6
2013-05-10 09:09:47 -07:00
pnp
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
power
Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next
2013-05-05 17:36:20 -07:00
pps
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
ps3
…
ptp
…
pwm
…
rapidio
…
regulator
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
remoteproc
Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
2013-05-07 14:04:56 -07:00
reset
…
rpmsg
Merge tag 'rpmsg-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg
2013-05-07 14:02:00 -07:00
rtc
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2013-05-09 14:34:58 -07:00
s390
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
sbus
…
scsi
Merge branch 'postmerge' into for-linus
2013-05-10 07:54:01 -07:00
sfi
…
sh
…
sn
…
spi
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
ssb
Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd
2013-05-09 10:15:46 -07:00
ssbi
…
staging
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
target
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
tc
…
thermal
…
tty
Merge git://git.infradead.org/users/eparis/audit
2013-05-11 14:29:11 -07:00
uio
…
usb
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2013-05-09 14:34:58 -07:00
uwb
uwb: rename random32() to prandom_u32()
2013-04-29 18:28:43 -07:00
vfio
Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio
2013-05-02 14:02:32 -07:00
vhost
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2013-05-07 10:13:52 -07:00
video
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-05-10 07:48:05 -07:00
virt
…
virtio
…
vlynq
…
vme
…
w1
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
watchdog
watchdog: Fix race condition in registration code
2013-05-09 08:13:41 +02:00
xen
Merge tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2013-05-11 16:19:30 -07:00
zorro
proc: Supply PDE attribute setting accessor functions
2013-05-01 17:29:18 -04:00
Kconfig
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-04 12:31:18 -07:00
Makefile
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-04 12:31:18 -07:00