android_kernel_samsung_msm8976/drivers/atm
Linus Torvalds 2e1ca21d46 Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
  kbuild: remove obsoleted scripts/reference_* files
  kbuild: fix make help & make *pkg
  kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
  Kconfig: remove the CONFIG_CC_ALIGN_* options
  kbuild: add -fverbose-asm to i386 Makefile
  kbuild: clean-up genksyms
  kbuild: Lindent genksyms.c
  kbuild: fix genksyms build error
  kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
  kbuild: replace PHONY with FORCE
  kbuild: Fix bug in crc symbol generating of kernel and modules
  kbuild: change kbuild to not rely on incorrect GNU make behavior
  kbuild: when warning symbols exported twice now tell user this is the problem
  kbuild: fix make dir/file.xx when asm symlink is missing
  kbuild: in the section mismatch check try harder to find symbols
  kbuild: fix section mismatch check for unwind on IA64
  kbuild: kill false positives from section mismatch warnings for powerpc
  kbuild: kill trailing whitespace in modpost & friends
  kbuild: small update of allnoconfig description
  kbuild: make namespace.pl CROSS_COMPILE happy
  ...

Trivial conflict in arch/ppc/boot/Makefile manually fixed up
2006-03-25 08:48:48 -08:00
..
.gitignore
adummy.c
ambassador.c
ambassador.h
atmsar11.data
atmsar11.regions
atmsar11.start
atmtcp.c
eni.c
eni.h
firestream.c
firestream.h
fore200e.c
fore200e.h
fore200e_firmware_copyright
fore200e_mkfirm.c
he.c
he.h
horizon.c
horizon.h
idt77105.c
idt77105.h
idt77252.c
idt77252.h
idt77252_tables.h
iphase.c
iphase.h
Kconfig
lanai.c
Makefile
midway.h
nicstar.c
nicstar.h
nicstarmac.c
nicstarmac.copyright
pca200e.data
pca200e_ecd.data
sba200e_ecd.data
suni.c
suni.h
tonga.h
uPD98401.h
uPD98402.c
uPD98402.h
zatm.c
zatm.h
zeprom.h