diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 12:57:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 12:57:52 -0700 |
| commit | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (patch) | |
| tree | 7ff78cda1d18a7b5eb5c6384815bb8f7b87cf5ce /kernel/time.c | |
| parent | 97405fe26b2a4df7090884b086ee8224ace2a6d1 (diff) | |
| parent | 587ca7619a150cef0ce0dd8fd08c367e502f0421 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
[AVR32] Initialize phy_mask for both macb devices
[AVR32] Fix atomic_add_unless() and atomic_sub_unless()
[AVR32] Correct misspelled CONFIG_BLK_DEV_INITRD variable.
[AVR32] Fix build error in parse_tag_rdimg()
[AVR32] Don't wire up macb0 unless SW6 is in default position
[AVR32] Wire up SSC platform device 0 as TX on ATSTK1000 board
[AVR32] Add Atmel SSC driver platform device to AT32AP architecture
[AVR32] Remove optimization of unaligned word loads
[AVR32] Make STK1000 mux settings configurable
[AVR32] CPU frequency scaling for AT32AP
[AVR32] Split SM device into PM, RTC, WDT and EIC
[AVR32] faster avr32 unaligned access
Diffstat (limited to 'kernel/time.c')
0 files changed, 0 insertions, 0 deletions