| commit | e568cc16ebb0dbb8b576034e8e96902d9e5f0c75 | |
| author | Dominic Duklas <dodo1122@googlemail.com> | |
| Sun, 14 Dec 2008 13:51:41 +0000 (14 13:51 +0000) | ||
| committer | Dominic Duklas <dodo1122@googlemail.com> | |
| Sun, 14 Dec 2008 13:51:41 +0000 (14 13:51 +0000) | ||
| tree | 034b999f38ccc1dcd601941140b5ea317f163eeb | treesnapshot (tar.gz zip) |
| parent | 40a7695fcf3db9aa4f2574e0f1af32f2cde93425 | commitdiff |
| parent | 5279585ff2bedc8180da5bdf8aa3ff1736466de2 | commitdiff |
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
Conflicts:
MAINTAINERS
Makefile
arch/mips/mti-malta/malta-mtd.c
drivers/acpi/battery.c
drivers/gpu/drm/i915/i915_gem.c
mm/backing-dev.c
Conflicts:
MAINTAINERS
Makefile
arch/mips/mti-malta/malta-mtd.c
drivers/acpi/battery.c
drivers/gpu/drm/i915/i915_gem.c
mm/backing-dev.c