| #
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 |
| 05-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
|
| #
5f00bcb3 |
| 25-Jul-2011 |
Stephen Rothwell <sfr@canb.auug.org.au> |
Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
vfs/nfs: fixup for nfs_open_context change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Mykleb
Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
vfs/nfs: fixup for nfs_open_context change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
show more ...
|
| #
87045b03 |
| 23-Jul-2011 |
James Bottomley <JBottomley@Parallels.com> |
Merge branch 'scsi-fixes'
|
| #
06f365ac |
| 23-Jul-2011 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next
|
|
Revision tags: v3.0 |
|
| #
994bf1c9 |
| 21-Jul-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest scheduler fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
8c11642a |
| 16-Jul-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v3.0-rc7' into devicetree/next
|
| #
62778396 |
| 15-Jul-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes
|
| #
4aa96ccf |
| 15-Jul-2011 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable
|
| #
6a7ebdf2 |
| 14-Jul-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
|
| #
4af358f8 |
| 13-Jul-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'fbdev/stable-updates'
|
| #
cf056edb |
| 13-Jul-2011 |
Dave Airlie <airlied@redhat.com> |
Merge 3.0-rc7 into drm-core-next
This pulls in all the drm fixes up to this point which are needed
for some -next patches to work.
|
|
Revision tags: 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.
|
| #
bc67f799 |
| 07-Jul-2011 |
Keith Packard <keithp@keithp.com> |
Merge branch 'drm-intel-fixes' into drm-intel-next
|
| #
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 |
|
| #
0466dcbe |
| 01-Jul-2011 |
Jesper Juhl <jj@chaosbits.net> |
Update version number references in README
When 3.0 is released I believe the README should reflect the new
numbering.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Linus Torvalds <t
Update version number references in README
When 3.0 is released I believe the README should reflect the new
numbering.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
|
Revision tags: v3.0-rc5, v3.0-rc4, v3.0-rc3, v3.0-rc2, v3.0-rc1 |
|
| #
6288cf1e |
| 29-May-2011 |
Len Brown <len.brown@intel.com> |
Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release
|
| #
ea77f7a2 |
| 26-May-2011 |
Eric Paris <eparis@redhat.com> |
Merge commit 'v2.6.39' into 20110526
Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c
|
| #
b73077eb |
| 24-May-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
|
Revision tags: v2.6.39, v2.6.39-rc7, v2.6.39-rc6, v2.6.39-rc5 |
|
| #
03351ff4 |
| 23-Apr-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.39-rc4' into next
|