android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_kernel_asus_sm8350/drivers
History
James Morris d2e7ad1922 Merge branch 'master' into next 
Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

Signed-off-by: James Morris <jmorris@namei.org>
2011-01-10 09:46:24 +11:00
..
accessibility
…
acpi
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
amba
…
ata
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
atm
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-01-04 11:57:25 -08:00
auxdisplay
…
base
…
block
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
bluetooth
Bluetooth: add NULL pointer check in HCI
2010-12-08 13:22:22 -02:00
cdrom
gdrom: don't use flush_scheduled_work()
2010-12-24 15:59:06 +01:00
char
Merge branch 'master' into next
2011-01-10 09:46:24 +11: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
perf: Clean up power events by introducing new, more generic ones
2011-01-04 08:16:54 +01:00
cpuidle
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
crypto
…
dca
…
dio
…
dma
dma: shdma: don't register the global die notifier multiple times
2011-01-07 11:03:26 +09:00
edac
Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2011-01-07 14:54:03 -08:00
eisa
…
firewire
firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI
2010-12-12 15:47:02 +01:00
firmware
…
gpio
Merge branch 'devel-stable' into devel
2011-01-06 22:33:32 +00:00
gpu
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-07 14:45:47 -08:00
hwmon
hwmon: (s3c-hwmon) Fix compilation
2011-01-02 15:31:11 -08:00
i2c
I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c
2010-12-20 17:53:04 -08:00
ide
…
idle
perf: Clean up power events by introducing new, more generic ones
2011-01-04 08:16:54 +01:00
ieee802154
…
infiniband
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
2011-01-07 08:56:33 -08:00
input
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
isdn
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
leds
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
lguest
…
macintosh
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
mca
…
md
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2010-12-20 09:19:46 -08:00
media
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
memstick
…
message
…
mfd
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
misc
ioc4: use static work_struct for ioc4_load_modules()
2010-12-24 16:14:20 +01:00
mmc
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
mtd
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
2011-01-07 08:56:33 -08:00
net
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
nubus
…
of
of/i2c: Fix request module by alias
2010-12-24 01:28:54 -07:00
oprofile
…
parisc
parisc: KittyHawk LCD fix
2010-12-04 11:18:25 -05:00
parport
…
pci
PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c
2010-12-23 12:51:49 -08:00
pcmcia
Merge branch 'devel-stable' into devel
2011-01-06 22:33:32 +00:00
platform
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-01-06 11:06:31 -08:00
pnp
ACPI/PNP: avoid section mismatch warning
2010-12-11 02:01:47 -05:00
power
workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()
2010-12-15 10:56:11 +01:00
pps
…
ps3
…
rapidio
…
regulator
regulator: tps6586x: correct register table
2010-12-09 09:23:43 +00:00
rtc
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
s390
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2011-01-07 12:47:02 -08:00
serial
Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2011-01-07 14:50:14 -08:00
sfi
…
sh
sh: intc: Initialize radix tree gfp mask explicitly.
2010-12-24 19:38:37 +09:00
sn
…
spi
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2011-01-07 17:08:46 -08:00
ssb
ssb: Use pci_is_pcie()
2010-12-22 15:43:26 -05:00
staging
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
tc
…
telephony
…
thermal
…
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
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
uwb
Merge branch 'usb-next' into musb-merge
2010-12-16 10:05:06 -08:00
vhost
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2010-12-14 11:33:23 -08:00
video
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
virtio
…
vlynq
…
w1
…
watchdog
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-01-06 16:50:35 -08:00
xen
xen: Use this_cpu_inc_return
2010-12-17 15:18:05 +01:00
zorro
…
Kconfig
…
Makefile
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00