?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 61282f3 0034102)
Merge branch 'master' into for-next
commite75d660672ddd11704b7f0fdb8ff21968587b266
authorJiri Kosina <jkosina@suse.cz>
Sun, 8 Apr 2012 19:48:52 +0000 (8 21:48 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sun, 8 Apr 2012 19:48:52 +0000 (8 21:48 +0200)
treeccb9c107744c10b553c0373e450bee3971d16c00tree | snapshot (tar.gz zip)
parent61282f37927143e45b03153f3e7b48d6b702147acommit | diff
parent0034102808e0dbbf3a2394b82b1bb40b5778de9ecommit | 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
CJK support for tty framebuffer vt