#
31cbecb4 |
| 03-Nov-2011 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'osd-devel' into nfs-for-next
|
#
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
|
#
b96d7157 |
| 27-Oct-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev: (50 commits) pata_efar: fix register naming used in efar_set_piomode
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev: (50 commits) pata_efar: fix register naming used in efar_set_piomode() pata_rdc: add Power Management support ata_piix: unify code for programming PIO and MWDMA timings ata_piix: SITRE handling fix libata: make ata_sff_data_xfer_noirq() work with 32-bit PIO pata_artop: add Power Management support pata_sl82c105: add Power Management support pata_pdc2027x: add Power Management support pata_legacy: use PIO mask defines pata_legacy: unify QDI ->set_piomode methods libata: remove no longer needed pata_qdi driver pata_it8213: fix register naming used in it8213_set_piomode() pata_it8213: add UDMA100 and UDMA133 support pata_rdc: parallel scanning needs an extra locking pata_via: add via_fixup() libata: ata_timing_compute() fixup pata_scc: add proper cable detection method pata_arasan_cf: remove bogus to_platform_device() calls pata_atiixp: add proper ->prereset method pata_serverworks: add serverworks_fixup() ...
show more ...
|
Revision tags: v3.1, v3.1-rc10, v3.1-rc9, v3.1-rc8, v3.1-rc7, v3.1-rc6 |
|
#
37210fbe |
| 07-Sep-2011 |
Pawel Moll <pawel.moll@arm.com> |
ata: Make pata_of_platform.c compile again and work on non-PPC platforms
This patch adds missing #includes, makes the driver selectable on non-PPC OF-enabled platforms and fixes property value acces
ata: Make pata_of_platform.c compile again and work on non-PPC platforms
This patch adds missing #includes, makes the driver selectable on non-PPC OF-enabled platforms and fixes property value accesses to be correct in Little Endian system.
Cc: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
show more ...
|
Revision tags: v3.1-rc5, v3.1-rc4, v3.1-rc3 |
|
#
94bd217e |
| 17-Aug-2011 |
Florian Tobias Schandinat <FlorianSchandinat@gmx.de> |
Merge commit 'v3.1-rc2' into HEAD
|
Revision tags: v3.1-rc2, v3.1-rc1, v3.0, v3.0-rc7, v3.0-rc6, 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
|
#
a18f22a9 |
| 14-May-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
Conflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.c
Rea
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
Conflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.c
Reason: Resolve conflicts so further cleanups do not conflict further
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
#
020abf03 |
| 10-May-2011 |
Stefan Richter <stefanr@s5r6.in-berlin.de> |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and sound/firewire/.
|
Revision tags: v2.6.39-rc4, v2.6.39-rc3, v2.6.39-rc2 |
|
#
f94f3cb3 |
| 03-Apr-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.39' into for-2.6.40
|
Revision tags: v2.6.39-rc1 |
|
#
cdccfc8d |
| 28-Mar-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/misc' into topic/misc
|
#
f6994ce4 |
| 28-Mar-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
#
72ed73c3 |
| 28-Mar-2011 |
Matthew Garrett <mjg@redhat.com> |
Merge branch 'x86-platform-next' into x86-platform
|
#
7bf7e370 |
| 25-Mar-2011 |
Artem Bityutskiy <Artem.Bityutskiy@nokia.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commi
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits) [media] rc: update for bitop name changes fs: simplify iget & friends fs: pull inode->i_lock up out of writeback_single_inode fs: rename inode_lock to inode_hash_lock fs: move i_wb_list out from under inode_lock fs: move i_sb_list out from under inode_lock fs: remove inode_lock from iput_final and prune_icache fs: Lock the inode LRU list separately fs: factor inode disposal fs: protect inode->i_state with inode->i_lock lib, arch: add filter argument to show_mem and fix private implementations SLUB: Write to per cpu data when allocating it slub: Fix debugobjects with lockless fastpath autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd() autofs4 - remove autofs4_lock autofs4 - fix d_manage() return on rcu-walk autofs4 - fix autofs4_expire_indirect() traversal autofs4 - fix dentry leak in autofs4_expire_direct() autofs4 - reinstate last used update on access vfs - check non-mountpoint dentry might block in __follow_mount_rcu() ...
NOTE!
This merge commit was created to fix compilation error. The block tree was merged upstream and removed the 'elv_queue_empty()' function which the new 'mtdswap' driver is using. So a simple merge of the mtd tree with upstream does not compile. And the mtd tree has already be published, so re-basing it is not an option.
To fix this unfortunate situation, I had to merge upstream into the mtd-2.6.git tree without committing, put the fixup patch on top of this, and then commit this. The result is that we do not have commits which do not compile.
In other words, this merge commit "merges" 3 things: the MTD tree, the upstream tree, and the fixup patch.
show more ...
|
#
02e24078 |
| 23-Mar-2011 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
Conflicts: arch/x86/kernel/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
|
#
2dd22997 |
| 17-Mar-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge remote-tracking branch 'origin' into spi/next
Pull in Linus' tree to pick up changes required for the langwell gpio fixes
|
#
1d2a1959 |
| 17-Mar-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
|
#
4c5811bf |
| 17-Mar-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits) tty: serial: altera_jtaguart: Add device tree suppo
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits) tty: serial: altera_jtaguart: Add device tree support tty: serial: altera_uart: Add devicetree support dt: eliminate of_platform_driver shim code dt: Eliminate of_platform_{,un}register_driver dt/serial: Eliminate users of of_platform_{,un}register_driver dt/usb: Eliminate users of of_platform_{,un}register_driver dt/video: Eliminate users of of_platform_{,un}register_driver dt/net: Eliminate users of of_platform_{,un}register_driver dt/sound: Eliminate users of of_platform_{,un}register_driver dt/spi: Eliminate users of of_platform_{,un}register_driver dt: uartlite: merge platform and of_platform driver bindings dt: xilinx_hwicap: merge platform and of_platform driver bindings ipmi: convert OF driver to platform driver leds/leds-gpio: merge platform_driver with of_platform_driver dt/sparc: Eliminate users of of_platform_{,un}register_driver dt/powerpc: Eliminate users of of_platform_{,un}register_driver dt/powerpc: move of_bus_type infrastructure to ibmebus drivercore/dt: add a match table pointer to struct device dt: Typo fix. altera_ps2: Add devicetree support ...
show more ...
|
Revision tags: v2.6.38 |
|
#
2d8ad871 |
| 09-Mar-2011 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.38-rc1' into kbuild/packaging
|
Revision tags: v2.6.38-rc8, v2.6.38-rc7, v2.6.38-rc6 |
|
#
1c48a5c9 |
| 17-Feb-2011 |
Grant Likely <grant.likely@secretlab.ca> |
dt: Eliminate of_platform_{,un}register_driver
Final step to eliminate of_platform_bus_type. They're all just platform drivers now.
v2: fix type in pasemi_nand.c (thanks to Stephen Rothwell)
Sign
dt: Eliminate of_platform_{,un}register_driver
Final step to eliminate of_platform_bus_type. They're all just platform drivers now.
v2: fix type in pasemi_nand.c (thanks to Stephen Rothwell)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
show more ...
|
Revision tags: v2.6.38-rc5, v2.6.38-rc4, v2.6.38-rc3 |
|
#
e8cdfb05 |
| 26-Jan-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest
|
Revision tags: v2.6.38-rc2, v2.6.38-rc1 |
|
#
f43dc23d |
| 13-Jan-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Conflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Conflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h
show more ...
|
Revision tags: v2.6.37 |
|
#
d392da52 |
| 30-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge v2.6.37-rc8 into powerpc/next
|