git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Jiri Kosina <jkosina@suse.cz>
	Sun, 8 Apr 2012 19:48:52 +0000 (21:48 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Sun, 8 Apr 2012 19:48:52 +0000 (21:48 +0200)
commit	0de6a3501f3c7816d0a7d63c7184bc1fb3bbd711
tree	ccb9c107744c10b553c0373e450bee3971d16c00	tree \| snapshot
parent	4aa6db86f7f69988ee80c5b77ec79dee90838141	commit \| diff
parent	321534157363a48672eb14d02bab9f757d91aa7c	commit \| diff

Merge branch 'master' into for-next

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
drivers/net/ethernet/realtek/r8169.c

14 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/alpha/kernel/pci_iommu.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/mips-mt.c	diff1 \|	diff2 \|	blob \| history
arch/mips/pci/pci-lantiq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_gart.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/docg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/power/bq27x00_battery.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/tps65910-regulator.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/u_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/video/au1100fb.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/alpha/kernel/pci_iommu.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/mips-mt.c	diff1 \|	diff2 \|	blob \| history
arch/mips/pci/pci-lantiq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_gart.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/docg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/power/bq27x00_battery.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/tps65910-regulator.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/u_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/video/au1100fb.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history