| #
47f0ac2b |
| 24-Nov-2011 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge tag 'v3.1' from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git into master
Battery tree missed last merge window, so it became stale enough
so that patches no longer apply as
Merge tag 'v3.1' from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git into master
Battery tree missed last merge window, so it became stale enough
so that patches no longer apply as people use pretty recent kernels.
show more ...
|
|
Revision tags: v3.2-rc3 |
|
| #
24942c8e |
| 16-Nov-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'master'; commit 'v3.2-rc2' into next
|
|
Revision tags: v3.2-rc2 |
|
| #
41966710 |
| 08-Nov-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-3.2' into for-3.3
|
|
Revision tags: v3.2-rc1 |
|
| #
d6363844 |
| 04-Nov-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
|
| #
6a8d2e2b |
| 30-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branches 'msm/dt', 'imx/dt' and 'at91/dt' into next/dt
|
| #
d4d9781d |
| 28-Oct-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
|
| #
a853ba8d |
| 24-Oct-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v3.1' into spi/next
|
|
Revision tags: v3.1 |
|
| #
91056a63 |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/cleanup
|
| #
995a0605 |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'at91/trng' into next/driver
|
| #
29ea3596 |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'imx/devel' into next/devel
|
| #
b4cbb8a4 |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
|
| #
1faca4ce |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'samsung/devel' of git+ssh://git.linaro.org/home/arndbergmann/public_git/arm-soc into next/devel2
|
| #
5c04b426 |
| 19-Oct-2011 |
Jens Axboe <axboe@kernel.dk> |
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
| #
017ed801 |
| 18-Oct-2011 |
Dave Airlie <airlied@redhat.com> |
Merge tag 'v3.1-rc10' into drm-core-next
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <ai
Merge tag 'v3.1-rc10' into drm-core-next
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
show more ...
|
|
Revision tags: v3.1-rc10 |
|
| #
8eb41582 |
| 17-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'ep93xx/board' into next/board
|
| #
07aaae44 |
| 15-Oct-2011 |
Florian Tobias Schandinat <FlorianSchandinat@gmx.de> |
Merge commit 'v3.1-rc9' into fbdev-next
|
| #
8efc59ad |
| 07-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'sirf/cleanup' into next/cleanup
|
| #
9514a567 |
| 05-Oct-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree/next
|
|
Revision tags: v3.1-rc9 |
|
| #
22f92bac |
| 04-Oct-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v3.1-rc8 |
|
| #
0d41da2e |
| 26-Sep-2011 |
Rafael J. Wysocki <rjw@sisk.pl> |
Merge branch 'pm-fixes' into pm-domains
Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_o
Merge branch 'pm-fixes' into pm-domains
Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.
Conflicts:
drivers/base/power/clock_ops.c
show more ...
|
| #
ed3982cf |
| 26-Sep-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v3.1-rc7' into perf/core
Merge reason: Pick up the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
8decf868 |
| 22-Sep-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wire
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
show more ...
|
|
Revision tags: v3.1-rc7 |
|
| #
1cce058b |
| 20-Sep-2011 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge remote-tracking branch 'origin/master' into next
(Merge in order to get the PCIe mps/mrss code fixes)
|
| #
e060c384 |
| 15-Sep-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
|
| #
bcd438be |
| 15-Sep-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6
* git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6: (25 commits)
[SCSI] bnx2i: Fixed the endian on TTT for NOP out transm
Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6
* git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6: (25 commits)
[SCSI] bnx2i: Fixed the endian on TTT for NOP out transmission
[SCSI] libfc: fix referencing to fc_fcp_pkt from the frame pointer via fr_fsp()
[SCSI] libfc: block SCSI eh thread for blocked rports
[SCSI] libfc: fix fc_eh_host_reset
[SCSI] fcoe: Fix deadlock between fip's recv_work and rtnl
[SCSI] qla2xxx: Update version number to 8.03.07.07-k.
[SCSI] qla2xxx: Set the task attributes after memsetting fcp cmnd.
[SCSI] qla2xxx: Correct inadvertent loop state transitions during port-update handling.
[SCSI] qla2xxx: Save and restore irq in the response queue interrupt handler.
[SCSI] qla2xxx: Double check for command completion if abort mailbox command fails.
[SCSI] qla2xxx: Acquire hardware lock while manipulating dsd list.
[SCSI] qla2xxx: Fix qla24xx revision check while enabling interrupts.
[SCSI] qla2xxx: T10 DIF - Fix incorrect error reporting.
[SCSI] qla2xxx: T10 DIF - Handle uninitalized sectors.
[SCSI] hpsa: fix physical device lun and target numbering problem
[SCSI] hpsa: fix problem that OBDR devices are not detected
[SCSI] isci: add version number
[SCSI] isci: fix event-get pointer increment
[SCSI] isci: dynamic interrupt coalescing
[SCSI] isci: Leave requests alone if already terminating.
...
show more ...
|