|
Revision tags: v3.1-rc3 |
|
| #
99b1bb61 |
| 21-Aug-2011 |
Joel Becker <jlbec@evilplan.org> |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
|
| #
94bd217e |
| 17-Aug-2011 |
Florian Tobias Schandinat <FlorianSchandinat@gmx.de> |
Merge commit 'v3.1-rc2' into HEAD
|
| #
2d9f8a6e |
| 15-Aug-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
|
Revision tags: v3.1-rc2 |
|
| #
0a2d31b6 |
| 08-Aug-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/kconfig' into for-linus
|
| #
2ddb4e94 |
| 08-Aug-2011 |
Alex Elder <aelder@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
|
| #
8c285645 |
| 08-Aug-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
|
| #
18d4ed43 |
| 08-Aug-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-3.1' into for-3.2
Conflict due to the fix for the register map failure - taken the for-3.1
version.
Conflicts:
sound/soc/codecs/sgtl5000.c
|
|
Revision tags: v3.1-rc1 |
|
| #
17b04360 |
| 04-Aug-2011 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge commit 'v3.0' into x86/vdso
|
| #
3d071cd3 |
| 02-Aug-2011 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge tag 'v3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
| #
aa7eb8e7 |
| 27-Jul-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
| #
a91f423e |
| 22-Jul-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus
|
|
Revision tags: v3.0, v3.0-rc7 |
|
| #
b7e9c223 |
| 11-Jul-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
|
| #
0c9e98af |
| 05-Jul-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartma
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
|
Revision tags: v3.0-rc6 |
|
| #
04bf7869 |
| 01-Jul-2011 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'for-linus' into for-3.1/core
Conflicts:
block/blk-throttle.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
| #
36b2e922 |
| 01-Jul-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v3.0-rc5' into sched/core
Merge reason: Move to a (much) newer base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
10e69627 |
| 01-Jul-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v3.0-rc5' into perf/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
5b944a71 |
| 30-Jun-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'linus' into next
|
| #
6da49a29 |
| 30-Jun-2011 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge remote branch 'origin/master' into next
|
|
Revision tags: v3.0-rc5 |
|
| #
dd37739f |
| 23-Jun-2011 |
Jesper Juhl <jj@chaosbits.net> |
Remove unneeded version.h includes from drivers/video/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/video/.
This patch removes them.
Sig
Remove unneeded version.h includes from drivers/video/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/video/.
This patch removes them.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
show more ...
|
| #
20733d59 |
| 24-Jun-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'fbdev/stable-updates'
|
| #
74d83b7e |
| 23-Jun-2011 |
Nicholas Bellinger <nab@linux-iscsi.org> |
Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
| #
2cd1176b |
| 21-Jun-2011 |
Keith Packard <keithp@keithp.com> |
Merge branch 'drm-intel-fixes' into drm-intel-next
|
| #
9f6ec8d6 |
| 21-Jun-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
show more ...
|
|
Revision tags: v3.0-rc4 |
|
| #
d0459e1a |
| 16-Jun-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest
|
| #
e1bbd19b |
| 15-Jun-2011 |
Andrew Morton <akpm@linux-foundation.org> |
drivers/video/backlight/adp8870_bl.c: add missed props.type conversion
Cc: Michael Hennerich <michael.hennerich@analog.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Matthew Garrett <mjg@redhat.com
drivers/video/backlight/adp8870_bl.c: add missed props.type conversion
Cc: Michael Hennerich <michael.hennerich@analog.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|