diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 13:55:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 13:55:49 -0700 |
| commit | 0151f94f2e61c39858e714a5d92244b0e5a7fdf5 (patch) | |
| tree | 2506632249220ce509ecacde35c630d74ffb2031 /init/initramfs.c | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| parent | d6879c585b7f8c2f3eb2f7e7beac806af4e9755c (diff) | |
| download | linux-0151f94f2e61c39858e714a5d92244b0e5a7fdf5.tar.gz linux-0151f94f2e61c39858e714a5d92244b0e5a7fdf5.tar.bz2 linux-0151f94f2e61c39858e714a5d92244b0e5a7fdf5.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: be less noisy when gets a gpio conflict after kernel has booted
Blackfin arch: add RSI's definitions to bf514 and bf516
Blackfin arch: add link-time asserts to make sure on-chip regions dont overflow
Blackfin arch: sport spi needs 6 gpio pins
Blackfin arch: add sport-spi related resource stuff to board file
Blackfin arch: Blacklist Hibernate (PM_SUSPEND_MEM) on BF561 as well
Blackfin arch: Privide BF537-STAMP platform data of ADP5520 Multifunction driver
Blackfin arch: enable the platfrom PATA driver with CF Cards
Blackfin arch: clean up sports header file
Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x
Blackfin arch: bf51x processors also have 8 timers
Blackfin arch: add a check to make sure only Blackfin GPIOs may generate IRQs
Blackfin arch: update default kernel configuration
Blackfin arch: include linux headers that this one uses definitions from fro sport drivers
Diffstat (limited to 'init/initramfs.c')
0 files changed, 0 insertions, 0 deletions