diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 19:06:22 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 19:06:22 +0100 |
| commit | 35437b6192d9a4eb92f095dfd72396b6d2970f0b (patch) | |
| tree | 2da81a1ac61620a7b91cf9ab0453b84bda8e71ce /scripts/patch-kernel | |
| parent | [ARM] 5200/1: am200epd: use fb notifiers and gpio api (diff) | |
| parent | [ARM] 5285/1: pxa: update xm_x2xx_defconfig (diff) | |
| parent | [ARM] 5197/1: gumstix: conversion to MFP support and add bluetooth support (diff) | |
| parent | [ARM] pxa: make "gpio_leds" static (diff) | |
| parent | [ARM] 5202/1: pxa: Added Mitac Mio A701 smartphone support. (diff) | |
| parent | [ARM] 5277/1: Add basic support for MobilePro 900/c (diff) | |
| parent | [ARM] 5223/1: zylonite: Staticise zylonite_i2c_board_info (diff) | |
| parent | [ARM] 4733/1: export sharpsl_param (diff) | |
Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines
Conflicts:
arch/arm/mach-pxa/poodle.c