shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-05-23 12:29:16 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
be4af5dfa6d976ba579bae16ff8714b755d44dad
linux/drivers
History
Ben Dooks be4af5dfa6 Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2 
Conflicts:
	drivers/i2c/busses/i2c-designware-core.c

Fixed up merge conflic
2011-11-01 00:52:53 +00:00
..
accessibility
…
acpi
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 17:08:43 +02:00
amba
clk: amba bus: convert to clk_prepare()/clk_unprepare()
2011-09-27 09:25:51 +01:00
ata
Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:39:10 +02:00
atm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2011-10-25 13:25:22 +02:00
auxdisplay
…
base
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2011-10-25 15:18:39 +02:00
bcma
Merge branch 'master' of github.com:davem330/net
2011-09-22 03:23:13 -04:00
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-10-25 12:11:02 +02:00
bluetooth
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2011-10-25 15:18:39 +02:00
cdrom
…
char
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2011-10-28 05:54:23 -07:00
clk
…
clocksource
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 17:15:03 +02:00
connector
connector: add comm change event report to proc connector
2011-09-28 13:41:50 -04:00
cpufreq
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 17:15:03 +02:00
cpuidle
PM QoS: Move and rename the implementation files
2011-08-25 15:35:03 +02:00
crypto
…
dca
locking, drivers/dca: Annotate dca_lock as raw
2011-09-13 11:12:12 +02:00
devfreq
PM / devfreq: Add basic governors
2011-10-02 00:19:34 +02:00
dio
…
dma
locking, dma, ipu: Annotate bank_lock as raw
2011-09-13 11:12:15 +02:00
edac
i7core_edac: fixed typo in error count calculation
2011-08-18 14:07:15 -07:00
eisa
…
firewire
firewire: ohci: add no MSI quirk for O2Micro controller
2011-09-16 22:22:10 +02:00
firmware
…
gpio
Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:39:10 +02:00
gpu
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2011-10-28 05:54:23 -07:00
hid
Merge branch 'next' into for-linus
2011-10-26 21:46:20 -07:00
hv
hv: remove struct hv_device_info from hyperv.h
2011-10-11 09:51:22 -06:00
hwmon
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-28 05:14:48 -07:00
hwspinlock
…
i2c
Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2
2011-11-01 00:52:53 +00:00
ide
Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:39:10 +02:00
idle
…
ieee802154
…
infiniband
net: add skb frag size accessors
2011-10-19 03:10:46 -04:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-10-27 08:44:20 +02:00
iommu
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 16:17:32 +02:00
isdn
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2011-10-26 15:11:09 +02:00
leds
Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-28 05:04:26 -07:00
lguest
…
macintosh
…
mca
…
md
Merge branch 'for-linus' of git://neil.brown.name/md
2011-10-26 21:39:42 +02:00
media
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2011-10-25 15:18:39 +02:00
memstick
…
message
…
mfd
Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:39:10 +02:00
misc
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2011-10-25 12:13:59 +02:00
mmc
Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:41:50 +02:00
mtd
Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:39:10 +02:00
net
Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:39:10 +02:00
nfc
nfc: NFC_WILINK depends on NFC_NCI
2011-09-21 16:19:44 -04:00
nubus
…
of
of_mdio: Don't phy_scan_fixups() twice
2011-10-25 06:55:52 +02:00
oprofile
locking, oprofile: Annotate oprofilefs lock as raw
2011-09-13 11:12:05 +02:00
parisc
doc: fix broken references
2011-09-27 18:08:04 +02:00
parport
parport_pc: release IO region properly if unsupported ITE887x card is found
2011-10-18 14:17:40 -07:00
pci
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 16:11:53 +02:00
pcmcia
Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:39:10 +02:00
pinctrl
pinctrl/sirf: fix sirfsoc_get_group_pins prototype
2011-10-25 10:43:57 +02:00
platform
thinkpad_acpi: Fix printk typo 'bluestooth'
2011-10-07 09:39:51 +02:00
pnp
…
power
s3c-adc-battery: Fix compilation error due to missing header (module.h)
2011-08-19 21:01:46 +04:00
pps
…
ps3
…
ptp
…
rapidio
rapidio: fix use of non-compatible registers
2011-08-25 16:25:34 -07:00
regulator
…
rtc
drivers/rtc/rtc-s3c.c: fix no occurrence of alarm interrupt
2011-09-14 18:09:38 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2011-10-25 13:25:22 +02:00
sbus
…
scsi
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
2011-10-26 21:33:50 +02:00
sfi
…
sh
…
sn
…
spi
Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:41:50 +02:00
ssb
ssb: fix DMA translation for some specific boards
2011-08-24 14:41:41 -04:00
staging
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2011-10-28 05:54:23 -07:00
target
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-10-25 12:11:02 +02:00
tc
…
telephony
…
thermal
…
tty
Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:41:50 +02:00
uio
uio: Support physical addresses >32 bits on 32-bit systems
2011-10-18 11:18:57 -07:00
usb
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
uwb
Remove unneeded version.h include from drivers/uwb/
2011-09-15 14:57:08 +02:00
vhost
…
video
Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-27 08:41:50 +02:00
virt
…
virtio
Add ethtool -g support to virtio_net
2011-10-24 02:07:21 -04:00
vlynq
…
w1
MAINTAINERS: Evgeniy has moved
2011-08-25 16:25:33 -07:00
watchdog
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 17:03:38 +02:00
xen
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 16:44:09 +02:00
zorro
zorro: Fix four checkpatch warnings
2011-10-24 21:00:34 +02:00
Kconfig
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2011-10-26 15:39:02 +02:00
Makefile
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2011-10-26 15:39:02 +02:00