sugar/linux
1
0
Fork 0
Code Activity
Files
cb532e4b2bb2f156e9a6c2c4535334db764f603c
linux/drivers
History
Dan Magenheimer cb532e4b2b staging: ramster: build ramster properly when CONFIG_OCFS2=m|y 
Due to some conflicting debug vars, kernel build will warn when
CONFIG_RAMSTER=y and CONFIG_OCFS2=m and will fail when
CONFIG_RAMSTER=y and CONFIG_OCFS2=y (rare).

Rename ramster mlog vars to avoid the name conflict.

Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-24 11:59:58 -08:00
..
accessibility
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
acpi
ACPI: remove duplicated lines of merging problems with acpi_processor_add
2012-02-08 15:07:03 -08:00
amba
…
ata
[libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list
2012-01-17 20:50:53 -05:00
atm
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
auxdisplay
…
base
driver-core: cpu: fix kobject warning when hotplugging a cpu
2012-02-08 15:11:17 -08:00
bcma
bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume
2012-01-17 09:54:08 -05:00
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-02-02 15:47:33 -08:00
bluetooth
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
cdrom
block: add and use scsi_blk_cmd_ioctl
2012-01-14 15:07:24 -08:00
char
agp: fix scratch page cleanup
2012-01-26 18:36:48 +00:00
clk
…
clocksource
…
connector
…
cpufreq
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
2012-01-11 18:53:33 -08:00
cpuidle
…
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-01-10 22:01:27 -08:00
dca
…
devfreq
…
dio
…
dma
i.MX SDMA: Fix burstsize settings
2012-02-02 14:00:43 +05:30
edac
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
eisa
…
firewire
firewire: ohci: disable MSI on Ricoh controllers
2012-01-30 21:33:34 +01:00
firmware
Merge commit '070680218379e15c1901f4bf21b98e3cbf12b527' into stable/for-linus-fixes-3.3
2012-01-12 11:53:55 -05:00
gpio
gpio: Add missing spin_lock_init in gpio-ml-ioh driver
2012-02-01 21:59:37 -07:00
gpu
drm/radeon/kms/blit: fix blit copy for very large buffers
2012-02-02 15:54:48 +00:00
hid
HID: wiimote: fix invalid power_supply_powers call
2012-02-07 13:40:56 +01:00
hv
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
hwmon
hwmon: (w83627ehf) Fix number of fans for NCT6776F
2012-02-04 18:08:23 -08:00
hwspinlock
…
i2c
i2c: OMAP: Fix OMAP1 build error
2012-01-20 08:24:22 -08:00
ide
block: add and use scsi_blk_cmd_ioctl
2012-01-14 15:07:24 -08:00
idle
ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores
2012-01-19 21:26:32 -05:00
ieee802154
…
infiniband
IB/srpt: Don't return freed pointer from srpt_alloc_ioctx_ring()
2012-02-06 08:57:11 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-02-04 10:57:42 -08:00
iommu
iommu/msm: Fix error handling in msm_iommu_unmap()
2012-01-30 12:53:14 +01:00
isdn
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
leds
drivers/leds/leds-lm3530.c: fix setting pltfm->als_vmax
2012-02-08 19:03:51 -08:00
lguest
lguest: Make sure interrupt is allocated ok by lguest_setup_irq
2012-01-12 15:44:47 +10:30
macintosh
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
mca
…
md
Merge tag 'md-3.3-fixes' of git://neil.brown.name/md
2012-02-08 19:06:30 -08:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-01-26 17:04:47 -08:00
memstick
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
message
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-01-10 10:36:08 -08:00
mfd
mfd: Avoid twl6040-codec PLL reconfiguration when not needed
2012-02-03 19:03:50 +01:00
misc
Merge tag 'char-misc-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2012-02-09 13:51:13 -08:00
mmc
drivers: misc: Remove MISC_DEVICES config option
2012-01-24 16:24:02 -08:00
mtd
Merge tag 'for-linus-3.3' of git://git.infradead.org/~dwmw2/mtd-3.3
2012-02-04 07:17:47 -08:00
net
Merge tag 'char-misc-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2012-02-09 13:51:13 -08:00
nfc
…
nubus
…
of
Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
2012-01-14 13:25:55 -08:00
oprofile
…
parisc
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
parport
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
pci
kernel-doc: fix new warnings in pci
2012-01-23 08:44:53 -08:00
pcmcia
pcmcia: fix socket refcount decrementing on each resume
2012-02-08 19:03:51 -08:00
pinctrl
pinctrl: add checks for empty function names
2012-01-26 14:13:11 +01:00
platform
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
pnp
…
power
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
pps
…
ps3
…
ptp
…
rapidio
…
regulator
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
2012-01-30 10:16:25 -08:00
rtc
Revert "RTC: sa1100: remove redundant code of setting alarm"
2012-01-19 17:26:26 +00:00
s390
[S390] dasd: revalidate server for new pathgroup
2012-01-18 18:03:42 +01:00
sbus
…
scsi
Staging: hv: storvsc: Move the storage driver out of the staging area
2012-02-13 11:35:20 -08:00
sfi
…
sh
Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh
2012-01-11 23:29:20 -08:00
sn
…
spi
spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver
2012-02-05 23:24:17 -07:00
ssb
…
staging
staging: ramster: build ramster properly when CONFIG_OCFS2=m|y
2012-02-24 11:59:58 -08:00
target
target: Fix unsupported WRITE_SAME sense payload
2012-02-07 06:48:58 +00:00
tc
…
thermal
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
tty
drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
2012-02-03 16:16:41 -08:00
uio
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
usb
USB: usbserial: add new PID number (0xa951) to the ftdi driver
2012-02-03 11:22:44 -08:00
uwb
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
vhost
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
video
Merge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6
2012-02-07 15:54:02 -08:00
virt
…
virtio
virtio: correct the memory barrier in virtqueue_kick_prepare()
2012-01-28 08:10:23 +10:30
vlynq
…
w1
…
watchdog
watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs
2012-01-27 10:01:16 +01:00
xen
xen/granttable: Disable grant v2 for HVM domains.
2012-01-27 11:14:16 -05:00
zorro
…
Kconfig
telephony: Move to staging
2012-02-08 16:58:04 -08:00
Makefile
staging: fix the build breakage cuased by telephony drivers
2012-02-09 09:07:46 -08:00