| #
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
|
| #
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
|
| #
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
|
| #
48d67fe0 |
| 26-Jul-2011 |
Larry Finger <Larry.Finger@lwfinger.net> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/staging/bcm/headers.h
drivers/staging/brcm8
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/staging/bcm/headers.h
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/staging/et131x/et131x_netdev.c
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192e/r8192E.h
drivers/staging/usbip/userspace/src/utils.h
show more ...
|
| #
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 |
| 22-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
|
| #
a91f423e |
| 22-Jul-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus
|
| #
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>
|
| #
5ddac6bc |
| 21-Jul-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'next-samsung-board' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/board
|
| #
ab2a0e0d |
| 21-Jul-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
|
| #
4d09a938 |
| 17-Jul-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm
Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel
show more ...
|
| #
bcacff29 |
| 17-Jul-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branches 'at91/fixes', 'imx/fixes' and 'pxa/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/fixes
|
| #
8c11642a |
| 15-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.
|