summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2009-10-26Merge branch 'quilt/usb'Stephen Rothwell
2009-10-26Merge branch 'quilt/tty'Stephen Rothwell
2009-10-26Merge remote branch 'percpu/for-next'Stephen Rothwell
2009-10-26Merge remote branch 'tip/auto-latest'Stephen Rothwell
2009-10-26Merge remote branch 'limits/writable_limits'Stephen Rothwell
2009-10-26Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2009-10-26Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2009-10-26Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: drivers/net/Kconfig lib/Kconfig
2009-10-26Merge remote branch 'catalin/for-next'Stephen Rothwell
2009-10-26Merge remote branch 'fsnotify/for-next'Stephen Rothwell
2009-10-26Merge remote branch 'suspend/linux-next'Stephen Rothwell
2009-10-26Merge remote branch 'trivial/for-next'Stephen Rothwell
Conflicts: drivers/acpi/video_detect.c
2009-10-26Merge remote branch 'osd/linux-next'Stephen Rothwell
2009-10-26Merge remote branch 'dwmw2-iommu/master'Stephen Rothwell
2009-10-26Merge remote branch 'security-testing/next'Stephen Rothwell
Conflicts: Documentation/dontdiff
2009-10-26Merge remote branch 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/mfd/Kconfig drivers/mfd/Makefile
2009-10-26Merge remote branch 'mfd/for-next'Stephen Rothwell
2009-10-26Merge remote branch 'slab/for-next'Stephen Rothwell
2009-10-26Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2009-10-26Merge remote branch 'pcmcia/master'Stephen Rothwell
2009-10-26Merge remote branch 'block/for-next'Stephen Rothwell
2009-10-26Merge remote branch 'input/next'Stephen Rothwell
2009-10-26Merge remote branch 'tmio-mmc/linux-next'Stephen Rothwell
2009-10-26Merge remote branch 'sound/for-next'Stephen Rothwell
2009-10-26Merge remote branch 'crypto/master'Stephen Rothwell
2009-10-26Merge remote branch 'mtd/master'Stephen Rothwell
2009-10-26Merge remote branch 'wireless/master'Stephen Rothwell
2009-10-26Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/sfc/sfe4001.c
2009-10-26Merge remote branch 'kvm/linux-next'Stephen Rothwell
Conflicts: arch/x86/kvm/mmu.c
2009-10-26Merge remote branch 'ubi/linux-next'Stephen Rothwell
2009-10-26Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2009-10-26Merge remote branch 'acpi/test'Stephen Rothwell
2009-10-26Merge remote branch 'kbuild/master'Stephen Rothwell
2009-10-26Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2009-10-26Merge branch 'quilt/i2c'Stephen Rothwell
2009-10-26Merge remote branch 'pci/linux-next'Stephen Rothwell
Conflicts: drivers/pci/pci.c
2009-10-26Merge remote branch 'reiserfs-bkl/reiserfs/kill-bkl'Stephen Rothwell
2009-10-26Merge remote branch 'gfs2/master'Stephen Rothwell
2009-10-26Merge remote branch 'md-current/for-linus'Stephen Rothwell
2009-10-26i2c: Drop probe, ignore and force module parametersJean Delvare
The legacy probe and force module parameters are obsolete now, the same can be achieved using the new_device sysfs interface, which is both more flexible and cheaper (it is implemented by i2c-core rather than replicated in every driver module.) The legacy ignore module parameters can be dropped as well. Ignoring can be done by instantiating a "dummy" device at the problematic address. This is the first step of a huge cleanup to i2c-core's i2c_detect function, i2c.h's I2C_CLIENT_INSMOD* macros, and all drivers that made use of them. Signed-off-by: Jean Delvare <khali@linux-fr.org>
2009-10-26i2c: Prevent priority inversion on top of bus lockMika Kuoppala
Low priority thread holding the i2c bus mutex could block higher priority threads to access the bus resulting in unacceptable latencies. Change the mutex type to rt_mutex preventing priority inversion. Tested-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mika Kuoppala <mika.kuoppala@nokia.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
2009-10-26i2c-piix4: Modify code name SB900 to Hudson-2Crane Cai
Change SB900 to its formal code name Hudson-2. Signed-off-by: Crane Cai <crane.cai@amd.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
2009-10-25Input: add driver for Dynapro serial touchscreenTias Guns
This is a driver for Dynapro serial touchscreen, which used to be supported in Xorg. The driver needs updated inputattach utility to initialize serial port and create proper serio device before the driver will be bound to it. Signed-off-by: Tias Guns <tias@ulyssis.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2009-10-25pcmcia: remove pcmcia_get_{first,next}_tuple()Dominik Brodowski
Remove the pcmcia_get_{first,next}_tuple() calls no longer needed by (current) pcmcia device drivers. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2009-10-25pcmcia: add new CIS access helpersDominik Brodowski
As a replacement to pcmcia_get_{first,next}_tuple() and pcmcia_get_tuple_data(), three new -- and easier to use -- functions are added: - pcmcia_get_tuple() to get the very first CIS entry of one type. - pcmcia_loop_tuple() to loop over all CIS entries of one type. - pcmcia_get_mac_from_cis() to read out the hardware MAC address from CISTPL_FUNCE. Only a handful of drivers need these functions anyway, as most CIS access is already handled by pcmcia_loop_config(), which now shares the same backed (pccard_loop_tuple()) with pcmcia_loop_tuple(). A pcmcia_get_mac_from_cis() bug noted by Komuro <komurojun-mbn@nifty.com> has been fixed in this revision. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2009-10-24pcmcia: drop already defined PCI_IDsWolfram Sang
Out of 10 PCI_IDs found in the PCMCIA subsystem, only two were not defined in pci_ids.h. Move them and drop the duplicates. Successfully build-tested. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2009-10-23core: split sys_setrlimitJiri Slaby
Create setrlimit from sys_setrlimit and declare setrlimit in the resource header. This is to allow rlimits to be changed not only by syscall, but later from proc code too. Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
2009-10-23core: add task_struct to update_rlimit_cpuJiri Slaby
Add task_struct as a parameter to update_rlimit_cpu to be able to set rlimit_cpu of different task than current. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Acked-by: James Morris <jmorris@namei.org>
2009-10-23SECURITY: add task_struct to setrlimitJiri Slaby
Add task_struct to task_setrlimit of security_operations to be able to set rlimit of different task than current. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Acked-by: Eric Paris <eparis@redhat.com> Acked-by: James Morris <jmorris@namei.org>
2009-10-22pkt_sched: skbedit add support for setting markjamal
This adds support for setting the skb mark. Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>