diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
| commit | 229aebb873e29726b91e076161649cf45154b0bf (patch) | |
| tree | acc02a3702215bce8d914f4c8cc3d7a1382b1c67 /arch/blackfin | |
| parent | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff) | |
| parent | 50a23e6eec6f20d55a3a920e47adb455bff6046e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 07c132dc4125..df82723fb504 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
| @@ -887,7 +887,7 @@ static struct adp5520_keys_platform_data adp5520_keys_data = { | |||
| 887 | }; | 887 | }; |
| 888 | 888 | ||
| 889 | /* | 889 | /* |
| 890 | * ADP5520/5501 Multifuction Device Init Data | 890 | * ADP5520/5501 Multifunction Device Init Data |
| 891 | */ | 891 | */ |
| 892 | 892 | ||
| 893 | static struct adp5520_platform_data adp5520_pdev_data = { | 893 | static struct adp5520_platform_data adp5520_pdev_data = { |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index c9e0e85629bf..cd2c797c8c9f 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
| @@ -2015,7 +2015,7 @@ static struct adp5520_keys_platform_data adp5520_keys_data = { | |||
| 2015 | }; | 2015 | }; |
| 2016 | 2016 | ||
| 2017 | /* | 2017 | /* |
| 2018 | * ADP5520/5501 Multifuction Device Init Data | 2018 | * ADP5520/5501 Multifunction Device Init Data |
| 2019 | */ | 2019 | */ |
| 2020 | 2020 | ||
| 2021 | static struct adp5520_platform_data adp5520_pdev_data = { | 2021 | static struct adp5520_platform_data adp5520_pdev_data = { |