| #
fd8aa2c1 |
| 09-Aug-2010 |
NeilBrown <neilb@suse.de> |
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
|
| #
d9a145fb |
| 08-Aug-2010 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'linus/master' into bkl/core
Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
|
| #
11e4afb4 |
| 06-Aug-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'gemini' and 'misc' into devel
|
| #
ab11b487 |
| 06-Aug-2010 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge branch 'master' into for-linus
|
| #
d790d4d5 |
| 04-Aug-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
| #
7a996d3a |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
|
| #
772320e8 |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
|
| #
baea90ea |
| 03-Aug-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
701ec7a7 |
| 03-Aug-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/configs/ap4evb_defconfig
arch/arm/configs/g3evm_defconfig
arch/arm/configs/g4evm_defc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/configs/ap4evb_defconfig
arch/arm/configs/g3evm_defconfig
arch/arm/configs/g4evm_defconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
show more ...
|
| #
412a4ac5 |
| 03-Aug-2010 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'gcl/next' into next
|
| #
055a1b8c |
| 02-Aug-2010 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'devel-misc' into omap-for-linus
|
| #
78276271 |
| 01-Aug-2010 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'drm-radeon-next' of ../drm-radeon-next into drm-core-next
* 'drm-radeon-next' of ../drm-radeon-next: (333 commits)
drm/radeon/kms: trivial code style fixes for audio
drm/radeon: re
Merge branch 'drm-radeon-next' of ../drm-radeon-next into drm-core-next
* 'drm-radeon-next' of ../drm-radeon-next: (333 commits)
drm/radeon/kms: trivial code style fixes for audio
drm/radeon: remove viewport transform from r6xx/r7xx blit emit
drm/radeon: group r6xx/r7xx newly sequential blit state
drm/radeon: reorder r6xx/r7xx blit state emit to make more regs sequential
drm/radeon: r6xx/r7xx move vport clipping to a single packet
drm/radeon: group r6xx/r7xx sequential blit state
drm/radeon: remove duplicate state emit in r6xx/r7xx blit
drm/radeon: add comments to r6xx/r7xx blit state
drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush
drm/radeon/kms: remove rs4xx gart limit
drm: radeon: fix sign bug
drm/radeon/kms: check/restore sanity before doing anything else with GPU.
drm/radeon: fall back to GTT if bo creation/validation in VRAM fails.
drm/radeon/kms: add ioport register access
drm/radeon/kms: enable HDMI audio on RS600/RS690/RS740
drm/radeon/kms: track audio engine state, do not use not setup timer
drm/radeon/kms/r6xx+: add query for tile config (v2)
drm/radeon/kms: fix CS alignment checking for tiling (v2)
drm/radeon/kms: add tiling support to the cs checker for r6xx/r7xx
drm/radeon/kms: Add crtc tiling setup support for evergreen
...
show more ...
|
| #
d656ae53 |
| 01-Aug-2010 |
Dave Airlie <airlied@redhat.com> |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
|
|
Revision tags: v2.6.35 |
|
| #
f13b1035 |
| 31-Jul-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'shmobile' into devel
|
| #
129961ec |
| 29-Jul-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
|
| #
7d50d07d |
| 28-Jul-2010 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge remote branch 'linus/master' into x86/cpu
|
| #
5ffdcd94 |
| 25-Jul-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.35-rc6' into spi/test
|
| #
4e4f62bf |
| 24-Jul-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
|
|
Revision tags: v2.6.35-rc6 |
|
| #
dca45ad8 |
| 21-Jul-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: Move from the -rc3 to the almost-rc6 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
9dcdbf7a |
| 21-Jul-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/core
Merge reason: Pick up the latest perf fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
d45840d9 |
| 20-Jul-2010 |
Andres Salomon <dilinger@queued.net> |
Andres has moved
My Collabora address is no longer enabled - update the MODULE_AUTHOR
fields of drivers to my current email address.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-b
Andres has moved
My Collabora address is no longer enabled - update the MODULE_AUTHOR
fields of drivers to my current email address.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
|
Revision tags: v2.6.35-rc5, v2.6.35-rc4, v2.6.35-rc3, v2.6.35-rc2 |
|
| #
e37c83c0 |
| 31-May-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.35-rc1' into for-2.6.36
|
|
Revision tags: v2.6.35-rc1 |
|
| #
19fdb9ee |
| 21-May-2010 |
NeilBrown <neilb@suse.de> |
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
show more ...
|
| #
0b28330e |
| 17-May-2010 |
Dan Williams <dan.j.williams@intel.com> |
Merge branch 'ioat' into dmaengine
|
| #
ac1d426e |
| 17-May-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
|