Merge commit 'v2.6.35-rc6' into devicetree/next

Browse source

Conflicts:
	arch/sparc/kernel/prom_64.c

...

This commit is contained in:

Grant Likely 2010-07-24 09:49:13 -06:00

parent 9e3288dc9a b37fa16e78

commit 4e4f62bf73

997 changed files with 10330 additions and 201642 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

2

arch/alpha/include/asm/bitops.h

View file

20

arch/alpha/kernel/Makefile

View file

38

arch/alpha/kernel/ns87312.c

View file

88

arch/alpha/kernel/pc873xx.c

View file

35

arch/alpha/kernel/pc873xx.h

View file

3

arch/alpha/kernel/pci-sysfs.c

View file

23

arch/alpha/kernel/sys_sio.c

View file

3

arch/arm/Kconfig

View file

1146

arch/arm/configs/acs5k_defconfig

View file

860

arch/arm/configs/acs5k_tiny_defconfig

View file

1159

arch/arm/configs/afeb9260_defconfig

View file

1044

arch/arm/configs/am200epdkit_defconfig

View file

1250

arch/arm/configs/am3517_evm_defconfig

View file

1226

arch/arm/configs/ams_delta_defconfig

View file

722

arch/arm/configs/ap4evb_defconfig

View file

862

arch/arm/configs/assabet_defconfig

View file

1318

arch/arm/configs/at572d940hfek_defconfig

View file

1109

arch/arm/configs/at91cap9adk_defconfig

View file

955

arch/arm/configs/at91rm9200dk_defconfig

View file

942

arch/arm/configs/at91rm9200ek_defconfig

View file

958

arch/arm/configs/at91sam9260ek_defconfig

View file

1087

arch/arm/configs/at91sam9261ek_defconfig

View file

1105

arch/arm/configs/at91sam9263ek_defconfig

View file

1051

arch/arm/configs/at91sam9g20ek_defconfig

View file

864

arch/arm/configs/at91sam9rlek_defconfig

View file

1222

arch/arm/configs/ateb9200_defconfig

View file

1218

arch/arm/configs/badge4_defconfig

View file

721

arch/arm/configs/bcmring_defconfig

View file

1089

arch/arm/configs/cam60_defconfig

View file

696

arch/arm/configs/carmeva_defconfig

View file

857

arch/arm/configs/cerfcube_defconfig

View file

1577

arch/arm/configs/cm_t35_defconfig

View file

1774

arch/arm/configs/cm_x2xx_defconfig

View file

1565

arch/arm/configs/cm_x300_defconfig

View file

759

arch/arm/configs/cns3420vb_defconfig

View file

1556

arch/arm/configs/colibri_pxa270_defconfig

View file

1082

arch/arm/configs/colibri_pxa300_defconfig

View file

887

arch/arm/configs/collie_defconfig

View file

1621

arch/arm/configs/corgi_defconfig

View file

1225

arch/arm/configs/cpu9260_defconfig

View file

1215

arch/arm/configs/cpu9g20_defconfig

View file

1207

arch/arm/configs/cpuat91_defconfig

View file

1115

arch/arm/configs/csb337_defconfig

View file

1126

arch/arm/configs/csb637_defconfig

View file

1205

arch/arm/configs/da8xx_omapl_defconfig

View file

1641

arch/arm/configs/davinci_all_defconfig

View file

1732

arch/arm/configs/devkit8000_defconfig

View file

1482

arch/arm/configs/dove_defconfig

View file

692

arch/arm/configs/ebsa110_defconfig

View file

1232

arch/arm/configs/ecbat91_defconfig

View file

554

arch/arm/configs/edb7211_defconfig

View file

1554

arch/arm/configs/em_x270_defconfig

View file

1340

arch/arm/configs/ep93xx_defconfig

View file

1128

arch/arm/configs/eseries_pxa_defconfig

View file

1582

arch/arm/configs/ezx_defconfig

View file

1185

arch/arm/configs/footbridge_defconfig

View file

538

arch/arm/configs/fortunet_defconfig

View file

717

arch/arm/configs/g3evm_defconfig

View file

722

arch/arm/configs/g4evm_defconfig

View file

1084

arch/arm/configs/h3600_defconfig

View file

917

arch/arm/configs/h5000_defconfig

View file

542

arch/arm/configs/h7201_defconfig

View file

697

arch/arm/configs/h7202_defconfig

View file

735

arch/arm/configs/hackkit_defconfig

View file

1073

arch/arm/configs/htcherald_defconfig

View file

1467

arch/arm/configs/igep0020_defconfig

View file

1649

arch/arm/configs/imote2_defconfig

View file

823

arch/arm/configs/integrator_defconfig

View file

1061

arch/arm/configs/iop13xx_defconfig

View file

1282

arch/arm/configs/iop32x_defconfig

View file

1300

arch/arm/configs/iop33x_defconfig

View file

1024

arch/arm/configs/ixp2000_defconfig

View file

1321

arch/arm/configs/ixp23xx_defconfig

View file

1394

arch/arm/configs/ixp4xx_defconfig

View file

1062

arch/arm/configs/jornada720_defconfig

View file

830

arch/arm/configs/kafa_defconfig

View file

1179

arch/arm/configs/kb9202_defconfig

View file

1700

arch/arm/configs/kirkwood_defconfig

View file

946

arch/arm/configs/ks8695_defconfig

View file

824

arch/arm/configs/lart_defconfig

View file

1028

arch/arm/configs/loki_defconfig

View file

968

arch/arm/configs/lpd270_defconfig

View file

841

arch/arm/configs/lpd7a400_defconfig

View file

1050

arch/arm/configs/lpd7a404_defconfig

View file

762

arch/arm/configs/lubbock_defconfig

View file

436

arch/arm/configs/lusl7200_defconfig

View file

1358

arch/arm/configs/magician_defconfig

View file

755

arch/arm/configs/mainstone_defconfig

View file

1722

arch/arm/configs/mini2440_defconfig

View file

1135

arch/arm/configs/mmp2_defconfig

View file

830

arch/arm/configs/msm_defconfig

View file

1547

arch/arm/configs/mv78xx0_defconfig

View file

1018

arch/arm/configs/mx1_defconfig

View file

1072

arch/arm/configs/mx21_defconfig

View file

1152

arch/arm/configs/mx27_defconfig

View file

728

arch/arm/configs/mx31pdk_defconfig

View file

1089

arch/arm/configs/mx3_defconfig

View file

1130

arch/arm/configs/mx51_defconfig

View file

1283

arch/arm/configs/n770_defconfig

View file

1134

arch/arm/configs/n8x0_defconfig

View file

Some files were not shown because too many files have changed in this diff Show more