summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/wil...Linus Torvalds2008-04-22136-143/+44
|\
| * Deprecate the asm/semaphore.h files in feature-removal-schedule.Matthew Wilcox2008-04-191-0/+8
| * Convert asm/semaphore.h users to linux/semaphore.hMatthew Wilcox2008-04-1932-36/+35
| * security: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-193-3/+0
| * lib: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-191-1/+0
| * kernel: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-196-7/+1
| * include: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-1913-15/+0
| * fs: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-195-5/+0
| * drivers: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-1938-38/+0
| * net: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-199-9/+0
| * arch: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-1928-29/+0
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-04-22376-12018/+34585
|\ \
| * \ Merge branch 'merge-fixes' into develRussell King2008-04-192366-165500/+141324
| |\ \
| | * | [ARM] Remove leds-tosa.cRussell King2008-04-191-132/+0
| | |/
| * | Merge branch 'omap2-upstream' into develRussell King2008-04-19737-14528/+24475
| |\ \
| | * | ARM: OMAP2: New DPLL clock frameworkRoman Tereshonkov2008-04-145-111/+410
| | * | ARM: OMAP2: Add 34xx clock codePaul Walmsley2008-04-142-0/+236
| | * | ARM: OMAP2: Add 34xx clocksPaul Walmsley2008-04-142-2/+2713
| | * | ARM: OMAP2: Remove old PRCM register access codePaul Walmsley2008-04-143-797/+1
| | * | ARM: OMAP2: Clean up 24xx clock codeTony Lindgren2008-04-144-62/+49
| | * | ARM: OMAP2: Remove old 24xx specific clock functionsPaul Walmsley2008-04-141-722/+0
| | * | ARM: OMAP: Add rest of 24xx clocksPaul Walmsley2008-04-141-530/+957
| | * | ARM: OMAP2: Change 24xx to use shared clock code and new reg accessPaul Walmsley2008-04-148-238/+562
| | * | ARM: OMAP2: Add common clock framework for 24xx and 34xxPaul Walmsley2008-04-142-0/+830
| | * | ARM: OMAP2: Move clock.c to clock24xx.cPaul Walmsley2008-04-142-1/+4
| | * | ARM: OMAP2: Move clock.h to clock24xx.hPaul Walmsley2008-04-142-1/+1
| | * | ARM: OMAP2: Remove old 24xx PM codeTony Lindgren2008-04-141-269/+1
| | * | ARM: OMAP2: Change 24xx to use new register accessPaul Walmsley2008-04-1415-121/+434
| | * | ARM: OMAP2: Add register access for 34xxTony Lindgren2008-04-142-0/+1251
| | * | ARM: OMAP2: Add common register access for 24xx and 34xxPaul Walmsley2008-04-1412-22/+1889
| | * | ARM: OMAP2: Clean-up mux codeTony Lindgren2008-04-144-51/+63
| | * | ARM: OMAP2: Add new pin multiplexing configurationsTony Lindgren2008-04-142-5/+84
| | * | ARM: OMAP: TimerMPU: Remove MPU-timer based sched_clock()Kevin Hilman2008-04-141-16/+0
| | * | ARM: OMAP: TimerMPU: Remove unused cycles-to-nsec conversionsKevin Hilman2008-04-141-33/+0
| | * | ARM: OMAP1: Timer32K: Fix timer32K for clockevents and clean it upTony Lindgren2008-04-141-5/+13
| | * | ARM: OMAP: Timer32K: Move timer32k to mach-omap1Kevin Hilman2008-04-143-5/+2
| | * | ARM: OMAP: Timer32K: Move 32k-based sched_clock() to common codeKevin Hilman2008-04-142-26/+17
| | * | ARM: OMAP: Timer32K: Re-organize duplicated 32k-timer codeKevin Hilman2008-04-144-61/+141
| | * | ARM: OMAP: Split omap_cfg_reg() into omap processor specific functionsTony Lindgren2008-04-143-137/+139
| | * | ARM: OMAP: Allow registering pin mux functionTony Lindgren2008-04-144-20/+60
| | * | ARM: OMAP: use edge/level handlers from generic IRQ frameworkKevin Hilman2008-04-141-35/+7
| | * | ARM: OMAP: Clear level-triggered GPIO interrupts in unmask hookKevin Hilman2008-04-141-14/+13
| | * | ARM: OMAP: Use gpiolib with tps65010 for OSK 5912David Brownell2008-04-143-117/+82
| | * | ARM: OMAP: I2C: tps65010 driver converts to gpiolibDavid Brownell2008-04-143-1/+131
| | * | ARM: OMAP: 5912 OSK GPIO updatesDavid Brownell2008-04-142-53/+17
| | * | ARM: OMAP: Use gpiolibDavid Brownell2008-04-143-60/+105
| | | |
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *---------------------. \ \ Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x...Russell King2008-04-19287-7029/+21672
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | [ARM] Add initial sparsemem supportRussell King2008-04-194-0/+23
| | | | | | | | | | | | * | | | [ARM] 5005/1: BAST: Fix kset_name initialiserBen Dooks2008-04-191-1/+1
| | | | | | | | | | | | * | | | [ARM] 4967/1: Adds functions to set clkout rate for Samsung S3C2410Davide Rizzo2008-04-191-0/+56