Jiri Slaby
5e00d1b5b4
BLOCK: fix bio.bi_rw handling ...
Return of the bi_rw tests is no longer bool after commit 74450be1. But
results of such tests are stored in bools. This doesn't fit in there
for some compilers (gcc 4.5 here), so either use !! magic to get real
bools or use ulong where the result is assigned somewhere.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
2010-08-23 12:33:10 +02:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-08-15 17:37:07 -07:00
ARM: AMBA: Add pclk support to AMBA bus infrastructure
2010-07-31 13:07:27 +01:00
ata: update for of_device to platform_device replacement
2010-08-16 15:13:28 -06:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
drivers/base/node.c: reduce stack usage of node_read_meminfo()
2010-08-09 20:45:02 -07:00
BLOCK: fix bio.bi_rw handling
2010-08-23 12:33:10 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
2010-08-22 11:03:27 -07:00
[CPUFREQ] fix brace coding style issue.
2010-08-03 13:47:05 -04:00
cpuidle: extend cpuidle and menu governor to handle dynamic states
2010-08-09 20:45:04 -07:00
[S390] zcrypt: fix Kconfig dependencies
2010-08-13 10:06:54 +02:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge firewire branches to be released post v2.6.35
2010-08-02 10:09:04 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-08-14 12:34:34 -07:00
gpiolib: Implement set_debounce for WM831x GPIOs
2010-08-12 11:27:57 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
2010-08-22 11:03:27 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2010-08-18 15:29:38 -07:00
revert "hwmon: f71882fg: add support for the Fintek F71808E"
2010-08-20 09:34:55 -07:00
Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux
2010-08-14 11:57:54 -07:00
ide: use module_param_named rather than module_param_call
2010-08-11 23:04:39 +09:30
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2010-08-15 11:17:52 -07:00
Merge firewire branches to be released post v2.6.35
2010-08-02 10:09:04 +02:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Input: fix faulty XXinput_* calls
2010-08-13 12:03:24 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-13 10:38:12 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
md raid-1/10 Fix bio_rw bit manipulations again
2010-08-18 16:16:05 +10:00
v4l: Remove reference to bkl ioctl in compat ioctl handling
2010-08-14 00:24:24 +02:00
memstick: fix hangs on unexpected device removal in mspro_blk
2010-08-12 08:43:31 -07:00
fusion: add function parameter names to kernel-doc
2010-08-14 16:21:00 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
2010-08-12 10:01:30 -07:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
drivers/mmc/host/sdhci-s3c.c: use the correct mutex and card detect function
2010-08-20 09:34:55 -07:00
Merge git://git.infradead.org/mtd-2.6
2010-08-21 12:47:05 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-17 18:34:37 -07:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-08-04 15:31:02 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge git://git.infradead.org/iommu-2.6
2010-08-15 17:34:20 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
platform/x86: move rfkill for Dell Mini 1012 to compal-laptop
2010-08-16 11:55:00 -04:00
Merge git://git.infradead.org/battery-2.6
2010-08-12 09:58:33 -07:00
regulator: Remove default DEBUG define from TPS6586x
2010-08-11 11:38:03 +01:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
2010-08-13 10:54:04 -07:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
drivers/scsi/qla4xxx: fix build
2010-08-20 09:34:56 -07:00
Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-18 09:26:17 -07:00
sh: add a reparent function to DIV6 clocks
2010-08-04 16:12:01 +09:00
m68knommu: include sched.h in ColdFire/SPI driver
2010-08-18 12:44:31 +10:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
fs: fs_struct rwlock to spinlock
2010-08-18 08:35:46 -04:00
pcmcia: do not use io_req_t when calling pcmcia_request_io()
2010-08-03 09:04:11 +02:00
uio: Remove IRQF_DISABLED flag from uio_cif.c
2010-08-05 13:53:33 -07:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-08-04 11:47:58 -07:00
matroxfb: fix incorrect use of memcpy_toio()
2010-08-20 09:34:54 -07:00
watchdog: hpwdt (12/12): Make NMI decoding a compile-time option
2010-08-13 20:54:53 +00:00
Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-08-12 09:09:41 -07:00
zorro: Fix reading of proc/bus/zorro/* in small chunks
2010-08-09 21:14:08 +02:00
5e00d1b5b4