aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linuxLinus Torvalds2009-01-053-201/+408
|\
| * Merge branch 'i2c-next-s3c' into i2c-nextBen Dooks2009-01-051-107/+78
| |\
| | * i2c-s3c2410: Change IRQ to be plain integer.Ben Dooks2008-12-161-14/+8
| | * i2c-s3c2410: Allow more than one i2c-s3c2410 adapterBen Dooks2008-12-161-14/+19
| | * i2c-s3c2410: Remove default platform data.Ben Dooks2008-12-161-31/+8
| | * i2c-s3c2410: Use platform data for gpio configurationBen Dooks2008-12-161-8/+3
| | * i2c-s3c2410: Fixup style problems from checkpatch.plBen Dooks2008-12-161-44/+44
| * | i2c-omap: fix type of irq handler functionBen Dooks2008-12-161-1/+1
| * | Merge branch 'i2c-for-ben' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Ben Dooks2008-12-162-94/+330
| |\ \ | | |/ | |/|
| | * i2c-omap: Enable I2C wakeups for 34xxKalle Jokiniemi2008-11-211-0/+27
| | * i2c-omap: reprogram OCP_SYSCONFIG register after resetPaul Walmsley2008-11-211-6/+34
| | * i2c-omap: convert 'rev1' flag to generic 'rev' u8Paul Walmsley2008-11-211-9/+16
| | * i2c-omap: fix I2C timeouts due to recursive omap_i2c_{un,}idle()Paul Walmsley2008-11-211-2/+7
| | * i2c-omap: Clean-up i2c-omapTony Lindgren2008-11-211-13/+18
| | * i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx buildsPaul Walmsley2008-11-211-0/+6
| | * i2c-omap: Mark init-only functions as __initPaul Walmsley2008-11-211-2/+2
| | * i2c-omap: Add support for omap34xxChandra shekhar2008-11-211-9/+11
| | * i2c-omap: FIFO handling support and broken hw workaround for i2c-omapNishanth Menon2008-11-211-40/+150
| | * i2c-omap: Add high-speed support to omap-i2cSyed Mohammed Khasim2008-11-212-24/+62
| | * i2c-omap: Close suspected race between omap_i2c_idle() and omap_i2c_isr()Paul Walmsley2008-11-211-4/+8
| | * i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msgJarkko Nikula2008-11-211-2/+6
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-01-0520-269/+685
|\ \ \
| * \ \ Merge branch 'upstream-fixes' into for-nextJiri Kosina2009-01-045-2/+10
| |\ \ \
| | * | | HID: fix error condition propagation in hid-sony driverJiri Kosina2009-01-041-1/+1
| | * | | HID: fix reference count leak hidrawOliver Neukum2009-01-041-1/+1
| | * | | HID: add proper support for pensketch 12x9 tabletMatt Helsley2009-01-042-0/+4
| | * | | HID: don't allow DealExtreme usb-radio be handled by usb hid driverAlexey Klimov2009-01-042-0/+4
| * | | | HID: fix default Kconfig setting for TopSpeed driverJiri Kosina2009-01-041-1/+1
| * | | | HID: driver for TopSeed Cyberlink quirky remoteLev Babiev2009-01-045-0/+89
| * | | | HID: make boot protocol drivers depend on EMBEDDEDParag Warudkar2009-01-041-1/+1
| * | | | HID: avoid sparse warning in HID_COMPAT_LOAD_DRIVERHannes Eder2009-01-041-0/+2
| * | | | HID: hiddev cleanup -- handle all error conditions properlyOliver Neukum2009-01-041-36/+99
| * | | | HID: force feedback driver for GreenAsia 0x12 PIDLukasz Lubojanski2009-01-045-0/+199
| * | | | HID: switch specialized drivers from "default y" to !EMBEDDEDDavid Brownell2009-01-041-17/+17
| * | | | HID: set proper dev.parent in hidrawJiri Kosina2009-01-041-1/+1
| * | | | HID: add dynids facilityJiri Slaby2009-01-042-3/+103
| * | | | HID: use GFP_KERNEL in hid_alloc_buffersJiri Slaby2009-01-041-7/+10
| * | | | HID: usbhid, use usb_endpoint_xfer_intJiri Slaby2009-01-041-1/+1
| * | | | HID: move usbhid flags to usbhid.hJiri Slaby2009-01-042-9/+10
| * | | | HID: add n-trig digitizer supportRafi Rubin2009-01-046-0/+97
| * | | | HID: add phys and name ioctls to hidrawJiri Kosina2009-01-042-0/+30
| * | | | HID: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2009-01-041-3/+4
| * | | | HID: automatically call usbhid_set_leds in usbhid driverAlan Stern2009-01-048-187/+9
| * | | | HID: non-input reports can also be numberedJiri Kosina2009-01-041-4/+2
| * | | | HID: ignore mouse interface for unibody macbooksJiri Kosina2009-01-041-0/+3
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2009-01-0543-1084/+964
|\ \ \ \
| * | | | GFS2: Use DEFINE_SPINLOCKJulia Lawall2009-01-051-1/+1
| * | | | GFS2: Fix use-after-free bug on umount (try #2)Steven Whitehouse2009-01-052-9/+12
| * | | | Revert "GFS2: Fix use-after-free bug on umount"Steven Whitehouse2009-01-056-94/+114
| * | | | GFS2: Streamline alloc calculations for writesSteven Whitehouse2009-01-054-49/+42