#
fb49fa53 |
| 29-Jul-2010 |
Dominik Brodowski <linux@dominikbrodowski.net> |
pcmcia: split up modify_configuration() into two fixup functions
pcmcia_modify_configuration() was only used by two drivers to fix up one issue each: setting the Vpp to a different value, and reduci
pcmcia: split up modify_configuration() into two fixup functions
pcmcia_modify_configuration() was only used by two drivers to fix up one issue each: setting the Vpp to a different value, and reducing the IO width to 8 bit. Introduce two explicitly named functions handling these things, and remove one further typedef.
CC: netdev@vger.kernel.org CC: linux-mtd@lists.infradead.org Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
show more ...
|
#
cdb13808 |
| 28-Jul-2010 |
Dominik Brodowski <linux@dominikbrodowski.net> |
pcmcia: do not use win_req_t when calling pcmcia_request_window()
Instead of win_req_t, drivers are now requested to fill out struct pcmcia_device *p_dev->resource[2,3,4,5] for up to four iomem rang
pcmcia: do not use win_req_t when calling pcmcia_request_window()
Instead of win_req_t, drivers are now requested to fill out struct pcmcia_device *p_dev->resource[2,3,4,5] for up to four iomem ranges. After a call to pcmcia_request_window(), the windows found there are reserved and may be used until pcmcia_release_window() is called.
CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-mtd@lists.infradead.org CC: Jiri Kosina <jkosina@suse.cz> CC: linux-scsi@vger.kernel.org Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
show more ...
|
#
9a457a52 |
| 27-Sep-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: pd6729: Fix error path
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: pd6729: Fix error path pcmcia: preserve configuration information if request_io fails partly
show more ...
|
#
73e6d6c6 |
| 24-Sep-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
|
#
4a445f29 |
| 24-Sep-2010 |
Dave Airlie <airlied@redhat.com> |
Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core-next
|
#
cf84fd96 |
| 21-Sep-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc5' into sched/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
7ed56920 |
| 21-Sep-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc5' into perf/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
e9e5f8e8 |
| 21-Sep-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into HEAD
Conflicts: drivers/char/agp/intel-agp.c drivers/gpu/drm/i915/intel_crt.c
|
#
db8c076b |
| 21-Sep-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge remote branch 'linus' into drm-intel-fixes
|
#
7cdffc86 |
| 18-Sep-2010 |
Dominik Brodowski <linux@dominikbrodowski.net> |
pcmcia: preserve configuration information if request_io fails partly
If pcmcia_request_io() only fails partly -- for the second of two requested resources -- preserve the configuration settings for
pcmcia: preserve configuration information if request_io fails partly
If pcmcia_request_io() only fails partly -- for the second of two requested resources -- preserve the configuration settings for the first one.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
show more ...
|
#
bd12e5c3 |
| 16-Sep-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia pcnet_cs: try setting i
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia pcnet_cs: try setting io_lines to 16 if card setup fails pcmcia: per-device, not per-socket debug messages pcmcia serial_cs.c: fix multifunction card handling
show more ...
|
#
eb838fe1 |
| 13-Sep-2010 |
Dominik Brodowski <linux@dominikbrodowski.net> |
pcmcia: per-device, not per-socket debug messages
As the iomem / ioport setup differs per device, it is much better to print out the device instead of the socket.
Tested-by: Wolfram Sang <w.sang@pe
pcmcia: per-device, not per-socket debug messages
As the iomem / ioport setup differs per device, it is much better to print out the device instead of the socket.
Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
show more ...
|
#
e199e613 |
| 09-Sep-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
daab7fc7 |
| 31-Aug-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc3' into x86/memblock
Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by: Ingo Molnar <min
Merge commit 'v2.6.36-rc3' into x86/memblock
Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
f632265d |
| 26-Aug-2010 |
J. Bruce Fields <bfields@redhat.com> |
Merge commit 'v2.6.36-rc1' into HEAD
|
#
e981b060 |
| 20-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
|
#
c8710ad3 |
| 19-Aug-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
|
#
6ab561c8 |
| 18-Aug-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/isa' into topic/misc
|
#
9714d315 |
| 16-Aug-2010 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
|
#
e4862f2f |
| 16-Aug-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename.
Conflicts: arch/arm/mach-mx2/clock_imx27.c arch
Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename.
Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c
show more ...
|
#
bbcf6e8b |
| 16-Aug-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/sh/include/asm/Kbuild drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
#
95ee46aa |
| 15-Aug-2010 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
Conflicts: drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
|
#
f46a6804 |
| 12-Aug-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
fb8231a8 |
| 10-Aug-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Conflicts: arch/arm/mach-omap1/board-nokia770.c
|
#
fd8aa2c1 |
| 10-Aug-2010 |
NeilBrown <neilb@suse.de> |
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
|