Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 109366
b: refs/heads/master
c: 6ffbb19
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Sep 2, 2008
1 parent 99bee33 commit 478ab8e
Show file tree
Hide file tree
Showing 346 changed files with 18,744 additions and 1,246 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c76da9da1fffa6de263486df54950eb328d58f71
refs/heads/master: 6ffbb1964afe1236951f7ac30aa0ed202673e374
2 changes: 1 addition & 1 deletion trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -4005,7 +4005,7 @@ S: Maintained

TI OMAP MMC INTERFACE DRIVER
P: Carlos Aguiar, Anderson Briglia and Syed Khasim
M: linux-omap-open-source@linux.omap.com (subscribers only)
M: linux-omap@vger.kernel.org
W: http://linux.omap.com
W: http://www.muru.com/linux/omap/
S: Maintained
Expand Down
2 changes: 1 addition & 1 deletion trunk/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 27
EXTRAVERSION = -rc4
EXTRAVERSION = -rc5
NAME = Rotary Wombat

# *DOCUMENTATION*
Expand Down
5 changes: 5 additions & 0 deletions trunk/arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,11 @@ config OABI_COMPAT
UNPREDICTABLE (in fact it can be predicted that it won't work
at all). If in doubt say Y.

config ARCH_FLATMEM_HAS_HOLES
bool
default y
depends on FLATMEM

config ARCH_DISCONTIGMEM_ENABLE
bool
default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
Expand Down
Loading

0 comments on commit 478ab8e

Please sign in to comment.