Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: panel: fix lcd panel driver build failure
  Staging: android: fix up units in timed_gpio
  Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size
  Staging: at76_usb: Add support for OQO Model 01+
  Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"
  Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port

...

This commit is contained in:

Linus Torvalds 2009-02-09 13:58:40 -08:00

parent 6707fbb56c 6136ac86b7

commit 7d1676629e

7 changed files with 3967 additions and 1037 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/staging/android/Kconfig

View file

14

drivers/staging/android/ram_console.c

View file

2

drivers/staging/android/timed_gpio.c

View file

2

drivers/staging/at76_usb/Kconfig

View file

4730

drivers/staging/at76_usb/at76_usb.c

View file

File diff suppressed because it is too large Load diff

229

drivers/staging/at76_usb/at76_usb.h

View file

10

drivers/staging/panel/panel.c

View file